diff options
| -rw-r--r-- | lisp/apropos.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 3 | ||||
| -rw-r--r-- | lisp/obsolete/complete.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index 6d7dc8af40..77c5023b0b 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -823,7 +823,7 @@ Returns list of symbols and documentation found." (lambda (symbol) (setq f (apropos-safe-documentation symbol) v (get symbol 'variable-documentation)) - (if (integerp v) (setq v)) + (if (integerp v) (setq v nil)) (setq f (apropos-documentation-internal f) v (apropos-documentation-internal v)) (setq sf (apropos-score-doc f) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index fc3bfc5fc5..b29e77b14b 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2287,8 +2287,7 @@ list that represents a doc string reference. ;; byte-compile-warn-about-unresolved-functions. (if (memq funsym byte-compile-noruntime-functions) (setq byte-compile-noruntime-functions - (delq funsym byte-compile-noruntime-functions) - byte-compile-noruntime-functions) + (delq funsym byte-compile-noruntime-functions)) (setq byte-compile-unresolved-functions (delq (assq funsym byte-compile-unresolved-functions) byte-compile-unresolved-functions))))) diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el index 87dedacbe1..e67ae5e2e5 100644 --- a/lisp/obsolete/complete.el +++ b/lisp/obsolete/complete.el @@ -1074,7 +1074,7 @@ absolute rather than relative to some directory on the SEARCH-PATH." (setq search-path (mapcar (lambda (dir) (concat dir subdir)) search-path) - file )) + file nil)) ;; Make list of completions in each directory on search-path (while search-path (let* ((dir (car search-path)) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index d9b4b6984f..f13906680c 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2594,7 +2594,7 @@ and overlay is highlighted between MK and END-MK." (goto-char mk))) (if end-mk (push-mark end-mk t) - (if mark-active (setq mark-active))) + (if mark-active (setq mark-active nil))) ;; If hideshow got in the way of ;; seeing the right place, open permanently. (dolist (ov (overlays-at (point))) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 99a990b441..e21aece85a 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -882,11 +882,11 @@ For an empty string, nil is returned (invalid CVS root)." (setq host uhost)) ;; Remove empty HOST (and (equal host "") - (setq host)) + (setq host nil)) ;; Fix windows style CVS root `:local:C:\\project\\cvs\\some\\dir' (and host (equal method "local") - (setq root (concat host ":" root) host)) + (setq root (concat host ":" root) host nil)) ;; Normalize CVS root record (list method user host root))))) |