diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/allout.el | 4 | ||||
| -rw-r--r-- | lisp/hilit-chg.el | 4 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 3 | ||||
| -rw-r--r-- | lisp/obsolete/tpu-mapper.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/ada-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/meta-mode.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 2 |
8 files changed, 13 insertions, 12 deletions
diff --git a/lisp/allout.el b/lisp/allout.el index a0456d5bd26..af71ea75ce0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1522,7 +1522,7 @@ the Emacs buffer state, if file variable adjustments are enabled. See `allout-enable-file-variable-adjustment' for details about that.") (make-variable-buffer-local 'allout-passphrase-verifier-string) (make-obsolete-variable 'allout-passphrase-verifier-string - 'allout-passphrase-verifier-string "23.3") + "it is no longer used." "23.3") ;;;###autoload (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp) ;;;_ = allout-passphrase-hint-string @@ -1538,7 +1538,7 @@ state, if file variable adjustments are enabled. See (make-variable-buffer-local 'allout-passphrase-hint-string) (setq-default allout-passphrase-hint-string "") (make-obsolete-variable 'allout-passphrase-hint-string - 'allout-passphrase-hint-string "23.3") + "it is no longer used." "23.3") ;;;###autoload (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp) ;;;_ = allout-after-save-decrypt diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 7c5294fa17e..9d4d2d8b383 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -297,9 +297,9 @@ modes only." (defcustom highlight-changes-global-changes-existing-buffers nil "If non-nil, toggling global Highlight Changes mode affects existing buffers. -Normally, `global-highlight-changes' affects only new buffers (to be +Normally, `global-highlight-changes-mode' affects only new buffers (to be created). However, if `highlight-changes-global-changes-existing-buffers' -is non-nil, then turning on `global-highlight-changes' will turn on +is non-nil, then turning on `global-highlight-changes-mode' will turn on Highlight Changes mode in suitable buffers, and turning the mode off will remove it from existing buffers." :type 'boolean diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 9b6f043b576..3227917494e 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -987,7 +987,8 @@ Moves point to the end of the new text." (defcustom completion-cycle-threshold nil "Number of completion candidates below which cycling is used. Depending on this setting `completion-in-region' may use cycling, -like `minibuffer-force-complete'. +whereby invoking a completion command several times in a row +completes to each of the candidates in turn, in a cyclic manner. If nil, cycling is never used. If t, cycling is always used. If an integer, cycling is used so long as there are not more diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el index 6a5a83c888b..4cc2404e4e7 100644 --- a/lisp/obsolete/tpu-mapper.el +++ b/lisp/obsolete/tpu-mapper.el @@ -56,7 +56,7 @@ (set-buffer "Keys") (insert (format"(global-set-key %s %s)\n" tpu-key func)) (set-buffer "Gold-Keys") - (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func)))) + (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func)))) (message "Press %s%s: " ident descrip) (setq tpu-key-seq (read-event) tpu-key (format "[%s]" tpu-key-seq)) @@ -203,7 +203,7 @@ your local X guru can try to figure out why the key is being ignored." ") (set-buffer "Directions") - (tpu-map-key "PF1" " - The GOLD key" "GOLD-map" "'keyboard-quit") + (tpu-map-key "PF1" " - The GOLD key" "tpu-gold-map" "'keyboard-quit") (tpu-map-key "PF2" " - The Keypad Help key" "'tpu-help" "'help-for-help") (tpu-map-key "PF3" " - The Find/Find-Next key" "'tpu-search-again" "'tpu-search") (tpu-map-key "PF4" " - The Del/Undelete Line key" "'tpu-delete-current-line" "'tpu-undelete-lines") diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 2d3f6e22a6c..76c9be93d03 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -231,7 +231,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or "Non-nil means remove trailing spaces and untabify the buffer before saving." :type 'boolean :group 'ada) (make-obsolete-variable 'ada-clean-buffer-before-saving - "use the `write-file-functions' hook." + "it has no effect - use `write-file-functions' hook." "23.2") diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index 7d20e02d80d..e207d22ff4a 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -47,8 +47,8 @@ ;; `metafont-mode-hook' and `metapost-mode-hook' which apply to the ;; individual modes. In addition, there are several variables and ;; regexps controlling e.g. the behavior of the indentation function, -;; which may be customized via `edit-options'. Please refer to the -;; docstrings in the code below for details. +;; which may be customized. Please refer to the docstrings in the code +;; below for details. ;; Availability: ;; diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index db595331bbd..18da6e33578 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -697,7 +697,7 @@ share the same state." (defun vc-dir-unmark () "Unmark the current file or all files in the region. If the region is active, unmark all the files in the region. -Otherwise mark the file on the current line and move to the next +Otherwise unmark the file on the current line and move to the next line." (interactive) (vc-dir-mark-unmark 'vc-dir-unmark-file)) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index b400c8d4a6f..825420c4261 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -256,7 +256,7 @@ bit output with no translation." (when (boundp 'w32-charset-info-alist) ;; The last charset we add becomes the "preferred" charset for the return - ;; value from w32-select-font etc, so list the most important charsets last. + ;; value from x-select-font etc, so list the most important charsets last. (w32-add-charset-info "iso8859-14" 'w32-charset-ansi 28604) (w32-add-charset-info "iso8859-15" 'w32-charset-ansi 28605) ;; The following two are included for pattern matching. |