Remove many items obsolete since Emacs 23.2 and 23.3
* lisp/allout.el (allout-init): * lisp/emacs-lisp/shadow.el (shadows-compare-text-p): * lisp/ffap.el (ffap-version): * lisp/filecache.el (file-cache-choose-completion): * lisp/help.el (print-help-return-message): * lisp/image-mode.el (image-mode-maybe): * lisp/imenu.el (imenu-example--name-and-position): * lisp/international/mule-cmds.el (princ-list): * lisp/mail/rmail.el (rmail-highlight-face): * lisp/minibuffer.el (read-file-name-predicate): * lisp/mouse.el (mouse-choose-completion): * lisp/progmodes/cc-cmds.el (c-forward-into-nomenclature): * lisp/progmodes/xscheme.el (advertised-xscheme-send-previous-expression): * lisp/simple.el (completion-base-size) (choose-completion-delete-max-match, exchange-dot-and-mark): * lisp/subr.el (eval-next-after-load): * lisp/term.el (term-dynamic-simple-complete): Remove items, obsolete since Emacs 23.2 and 23.3. * doc/misc/cc-mode.texi (Movement Commands): Doc fix. * doc/lispref/help.texi (Accessing Documentation): * lisp/emacs-lisp/edebug.el (edebug-wrap-def-body): * lisp/comint.el (comint-dynamic-list-completions): * lisp/progmodes/idlwave.el (idlwave-make-modified-completion-map-xemacs) (idlwave-make-modified-completion-map-emacs) (idlwave-choose-completion): * lisp/progmodes/vhdl-mode.el: * lisp/term.el (term-dynamic-list-completions): Remove references to 'mouse-choose-completion'. * lisp/image-mode.el (image-mode-to-text): Remove reference to 'image-mode-maybe'. * lisp/mail/rmail.el (rmail-highlight-headers): Use 'rmail-highlight' face instead of 'rmail-highlight-face'. * lisp/progmodes/antlr-mode.el (antlr-mode-map, antlr-mode-menu): Remove reference to 'c-forward-into-nomenclature'. * lisp/simple.el (choose-completion, choose-completion-string) (completion-list-mode, completion-setup-function): Don't use 'completion-base-size'. ; * etc/NEWS: List removed items. This was discussed in https://lists.gnu.org/archive/html/emacs-devel/2020-08/msg00400.html
This commit is contained in:
Stefan Kangas
parent
631c73b280
commit
326fdb9ec0
22 changed files with 40 additions and 224 deletions
|
|
@ -1024,9 +1024,7 @@ These key sequences are not bound in AWK Mode, which doesn't have
|
|||
preprocessor statements.
|
||||
|
||||
@item @kbd{M-x c-backward-into-nomenclature}
|
||||
@itemx @kbd{M-x c-forward-into-nomenclature}
|
||||
@findex c-backward-into-nomenclature
|
||||
@findex c-forward-into-nomenclature
|
||||
@findex backward-into-nomenclature @r{(c-)}
|
||||
@findex forward-into-nomenclature @r{(c-)}
|
||||
A popular programming style, especially for object-oriented languages
|
||||
|
|
|
|||
45
etc/NEWS
45
etc/NEWS
|
|
@ -1066,33 +1066,40 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
|
|||
|
||||
---
|
||||
** Some functions and variables obsolete since Emacs 23 have been removed:
|
||||
|
||||
'GOLD-map', 'bookmark-jump-noselect',
|
||||
'GOLD-map', 'advertised-xscheme-send-previous-expression',
|
||||
'allout-init', 'bookmark-jump-noselect',
|
||||
'bookmark-read-annotation-text-func', 'buffer-menu-mode-hook',
|
||||
'char-coding-system-table', 'char-valid-p', 'charset-bytes',
|
||||
'charset-id', 'charset-list' (function), 'complete-in-turn',
|
||||
'completion-common-substring', 'crm-minibuffer-complete',
|
||||
'crm-minibuffer-complete-and-exit', 'crm-minibuffer-completion-help',
|
||||
'custom-mode', 'custom-mode-hook', 'detect-coding-with-priority',
|
||||
'dirtrack-debug' (function), 'dirtrack-debug-toggle',
|
||||
'dynamic-completion-table',
|
||||
'c-forward-into-nomenclature', 'char-coding-system-table',
|
||||
'char-valid-p', 'charset-bytes', 'charset-id', 'charset-list'
|
||||
(function), 'choose-completion-delete-max-match', 'complete-in-turn',
|
||||
'completion-base-size', 'completion-common-substring',
|
||||
'crm-minibuffer-complete', 'crm-minibuffer-complete-and-exit',
|
||||
'crm-minibuffer-completion-help', 'custom-mode', 'custom-mode-hook',
|
||||
'detect-coding-with-priority', 'dirtrack-debug' (function),
|
||||
'dirtrack-debug-toggle', 'dynamic-completion-table',
|
||||
'easy-menu-precalculate-equivalent-keybindings',
|
||||
'epa-display-verify-result', 'epg-passphrase-callback-function',
|
||||
'eshell-report-bug', 'ffap-bug', 'ffap-submit-bug', 'forward-point',
|
||||
'generic-char-p', 'global-highlight-changes', 'hi-lock-face-history',
|
||||
'eshell-report-bug', 'eval-next-after-load', 'exchange-dot-and-mark',
|
||||
'ffap-bug', 'ffap-submit-bug', 'ffap-version',
|
||||
'file-cache-choose-completion', 'forward-point', 'generic-char-p',
|
||||
'global-highlight-changes', 'hi-lock-face-history',
|
||||
'hi-lock-regexp-history', 'highlight-changes-active-string',
|
||||
'highlight-changes-initial-state', 'highlight-changes-passive-string',
|
||||
'image-mode-maybe', 'imenu-example--name-and-position',
|
||||
'ispell-aspell-supports-utf8', 'lisp-mode-auto-fill',
|
||||
'locate-file-completion', 'make-coding-system',
|
||||
'minibuffer-local-must-match-filename-map', 'mouse-major-mode-menu',
|
||||
'mouse-popup-menubar', 'mouse-popup-menubar-stuff',
|
||||
'newsticker-groups-filename', 'non-iso-charset-alist',
|
||||
'nonascii-insert-offset', 'nonascii-translation-table',
|
||||
'password-read-and-add', 'pre-abbrev-expand-hook',
|
||||
'process-filter-multibyte-p', 'remember-buffer' (function),
|
||||
'minibuffer-local-must-match-filename-map', 'mouse-choose-completion',
|
||||
'mouse-major-mode-menu', 'mouse-popup-menubar',
|
||||
'mouse-popup-menubar-stuff', 'newsticker-groups-filename',
|
||||
'non-iso-charset-alist', 'nonascii-insert-offset',
|
||||
'nonascii-translation-table', 'password-read-and-add',
|
||||
'pre-abbrev-expand-hook', 'princ-list', 'print-help-return-message',
|
||||
'process-filter-multibyte-p', 'read-file-name-predicate',
|
||||
'remember-buffer' (function), 'rmail-highlight-face',
|
||||
'rmail-message-filter', 'set-coding-priority',
|
||||
'set-process-filter-multibyte', 'shell-dirtrack-toggle',
|
||||
't-mouse-mode', 'tooltip-hook', 'tpu-have-ispell',
|
||||
'set-process-filter-multibyte', 'shadows-compare-text-p',
|
||||
'shell-dirtrack-toggle', 't-mouse-mode',
|
||||
'term-dynamic-simple-complete', 'tooltip-hook', 'tpu-have-ispell',
|
||||
'url-generate-unique-filename', 'url-temporary-directory',
|
||||
'vc-arch-command', 'vc-default-working-revision' (variable),
|
||||
'vc-mtn-command', 'vc-revert-buffer', 'vc-workfile-version',
|
||||
|
|
|
|||
|
|
@ -62,8 +62,7 @@
|
|||
;; The outline menubar additions provide quick reference to many of the
|
||||
;; features. See the docstring of the variables `allout-layout' and
|
||||
;; `allout-auto-activation' for details on automatic activation of
|
||||
;; `allout-mode' as a minor mode. (`allout-init' is deprecated in favor of
|
||||
;; a purely customization-based method.)
|
||||
;; `allout-mode' as a minor mode.
|
||||
;;
|
||||
;; Note -- the lines beginning with `;;;_' are outline topic headers.
|
||||
;; Customize `allout-auto-activation' to enable, then revisit this
|
||||
|
|
@ -1627,18 +1626,6 @@ non-nil in a lasting way.")
|
|||
"If t, `allout-mode's last deactivation was deliberate.
|
||||
So `allout-post-command-business' should not reactivate it...")
|
||||
(make-variable-buffer-local 'allout-explicitly-deactivated)
|
||||
;;;_ > allout-init (mode)
|
||||
(defun allout-init (mode)
|
||||
"DEPRECATED - configure allout activation by customizing
|
||||
`allout-auto-activation'. This function remains around, limited
|
||||
from what it did before, for backwards compatibility.
|
||||
|
||||
MODE is the activation mode - see `allout-auto-activation' for
|
||||
valid values."
|
||||
(declare (obsolete allout-auto-activation "23.3"))
|
||||
(customize-set-variable 'allout-auto-activation (format "%s" mode))
|
||||
(format "%s" mode))
|
||||
|
||||
;;;_ > allout-setup-menubar ()
|
||||
(defun allout-setup-menubar ()
|
||||
"Populate the current buffer's menubar with `allout-mode' stuff."
|
||||
|
|
|
|||
|
|
@ -3450,7 +3450,7 @@ the completions."
|
|||
(eq (window-buffer (posn-window (event-start first)))
|
||||
(get-buffer "*Completions*"))
|
||||
(memq (key-binding key)
|
||||
'(mouse-choose-completion choose-completion))))
|
||||
'(choose-completion))))
|
||||
;; If the user does choose-completion with the mouse,
|
||||
;; execute the command, then delete the completion window.
|
||||
(progn
|
||||
|
|
|
|||
|
|
@ -55,9 +55,6 @@
|
|||
:prefix "load-path-shadows-"
|
||||
:group 'lisp)
|
||||
|
||||
(define-obsolete-variable-alias 'shadows-compare-text-p
|
||||
'load-path-shadows-compare-text "23.3")
|
||||
|
||||
(defcustom load-path-shadows-compare-text nil
|
||||
"If non-nil, then shadowing files are reported only if their text differs.
|
||||
This is slower, but filters out some innocuous shadowing."
|
||||
|
|
|
|||
|
|
@ -110,8 +110,6 @@
|
|||
(require 'url-parse)
|
||||
(require 'thingatpt)
|
||||
|
||||
(define-obsolete-variable-alias 'ffap-version 'emacs-version "23.2")
|
||||
|
||||
(defgroup ffap nil
|
||||
"Find file or URL at point."
|
||||
:group 'matching
|
||||
|
|
|
|||
|
|
@ -614,9 +614,6 @@ the name is considered already unique; only the second substitution
|
|||
(select-window (active-minibuffer-window))
|
||||
(file-cache-minibuffer-complete nil)))
|
||||
|
||||
(define-obsolete-function-alias 'file-cache-mouse-choose-completion
|
||||
#'file-cache-choose-completion "23.2")
|
||||
|
||||
(defun file-cache-complete ()
|
||||
"Complete the word at point, using the filecache."
|
||||
(interactive)
|
||||
|
|
|
|||
|
|
@ -131,7 +131,6 @@ This is a list
|
|||
(WINDOW . quit-window) do quit-window, then select WINDOW.
|
||||
(WINDOW BUF START POINT) display BUF at START, POINT, then select WINDOW.")
|
||||
|
||||
(define-obsolete-function-alias 'print-help-return-message 'help-print-return-message "23.2")
|
||||
(defun help-print-return-message (&optional function)
|
||||
"Display or return message saying how to restore windows after help command.
|
||||
This function assumes that `standard-output' is the help buffer.
|
||||
|
|
|
|||
|
|
@ -718,7 +718,7 @@ A non-mage major mode found from `auto-mode-alist' or fundamental mode
|
|||
displays an image file as text."
|
||||
;; image-mode-as-text = normal-mode + image-minor-mode
|
||||
(let ((previous-image-type image-type)) ; preserve `image-type'
|
||||
(major-mode-restore '(image-mode image-mode-maybe image-mode-as-text))
|
||||
(major-mode-restore '(image-mode image-mode-as-text))
|
||||
;; Restore `image-type' after `kill-all-local-variables' in `normal-mode'.
|
||||
(setq image-type previous-image-type)
|
||||
;; Enable image minor mode with `C-c C-c'.
|
||||
|
|
@ -768,8 +768,6 @@ on these modes."
|
|||
(if (image-get-display-property)
|
||||
"text" "an image or hex") ".")))
|
||||
|
||||
(define-obsolete-function-alias 'image-mode-maybe 'image-mode "23.2")
|
||||
|
||||
(defun image-toggle-display-text ()
|
||||
"Show the image file as text.
|
||||
Remove text properties that display the image."
|
||||
|
|
|
|||
|
|
@ -316,28 +316,6 @@ PREVPOS is the variable in which we store the last position displayed."
|
|||
)
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;;
|
||||
;;;; Some examples of functions utilizing the framework of this
|
||||
;;;; package.
|
||||
;;;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; FIXME: This was the only imenu-example-* definition actually used,
|
||||
;; by cperl-mode.el. Now cperl-mode has its own copy, so these can
|
||||
;; all be removed.
|
||||
(defun imenu-example--name-and-position ()
|
||||
"Return the current/previous sexp and its (beginning) location.
|
||||
Don't move point."
|
||||
(declare (obsolete "use your own function instead." "23.2"))
|
||||
(save-excursion
|
||||
(forward-sexp -1)
|
||||
;; [ydi] modified for imenu-use-markers
|
||||
(let ((beg (if imenu-use-markers (point-marker) (point)))
|
||||
(end (progn (forward-sexp) (point))))
|
||||
(cons (buffer-substring beg end)
|
||||
beg))))
|
||||
|
||||
;;;
|
||||
;;; Lisp
|
||||
;;;
|
||||
|
|
|
|||
|
|
@ -2070,12 +2070,6 @@ See `set-language-info-alist' for use in programs."
|
|||
"Do various unibyte-mode setups for language environment LANGUAGE-NAME."
|
||||
(set-display-table-and-terminal-coding-system language-name))
|
||||
|
||||
(defun princ-list (&rest args)
|
||||
"Print all arguments with `princ', then print \"\\n\"."
|
||||
(declare (obsolete "use mapc and princ instead." "23.3"))
|
||||
(mapc #'princ args)
|
||||
(princ "\n"))
|
||||
|
||||
(put 'describe-specified-language-support 'apropos-inhibit t)
|
||||
|
||||
;; Print language-specific information such as input methods,
|
||||
|
|
|
|||
|
|
@ -417,20 +417,6 @@ The variable `rmail-highlighted-headers' specifies which headers."
|
|||
:group 'rmail-headers
|
||||
:version "22.1")
|
||||
|
||||
;; This was removed in Emacs 23.1 with no notification, an unnecessary
|
||||
;; incompatible change.
|
||||
(defcustom rmail-highlight-face 'rmail-highlight
|
||||
"Face used by Rmail for highlighting headers."
|
||||
;; Note that nil doesn't actually mean use the default face, it
|
||||
;; means use either bold or highlight. It's not worth fixing this
|
||||
;; now that this is obsolete.
|
||||
:type '(choice (const :tag "Default" nil)
|
||||
face)
|
||||
:group 'rmail-headers)
|
||||
(make-obsolete-variable 'rmail-highlight-face
|
||||
"customize the face `rmail-highlight' instead."
|
||||
"23.2")
|
||||
|
||||
(defface rmail-header-name
|
||||
'((t (:inherit font-lock-function-name-face)))
|
||||
"Face to use for highlighting the header names.
|
||||
|
|
@ -3012,7 +2998,7 @@ using the coding system CODING."
|
|||
|
||||
(defun rmail-highlight-headers ()
|
||||
"Highlight the headers specified by `rmail-highlighted-headers'.
|
||||
Uses the face specified by `rmail-highlight-face'."
|
||||
Uses the face `rmail-highlight'."
|
||||
(if rmail-highlighted-headers
|
||||
(save-excursion
|
||||
(search-forward "\n\n" nil 'move)
|
||||
|
|
@ -3020,11 +3006,7 @@ Uses the face specified by `rmail-highlight-face'."
|
|||
(narrow-to-region (point-min) (point))
|
||||
(let ((case-fold-search t)
|
||||
(inhibit-read-only t)
|
||||
;; When rmail-highlight-face is removed, just
|
||||
;; use 'rmail-highlight here.
|
||||
(face (or rmail-highlight-face
|
||||
(if (face-differs-from-default-p 'bold)
|
||||
'bold 'highlight)))
|
||||
(face 'rmail-highlight)
|
||||
;; List of overlays to reuse.
|
||||
(overlays rmail-overlay-list))
|
||||
(goto-char (point-min))
|
||||
|
|
|
|||
|
|
@ -2539,11 +2539,6 @@ same as `substitute-in-file-name'."
|
|||
all))))))
|
||||
(file-error nil))) ;PCM often calls with invalid directories.
|
||||
|
||||
(defvar read-file-name-predicate nil
|
||||
"Current predicate used by `read-file-name-internal'.")
|
||||
(make-obsolete-variable 'read-file-name-predicate
|
||||
"use the regular PRED argument" "23.2")
|
||||
|
||||
(defun completion--sifn-requote (upos qstr)
|
||||
;; We're looking for `qpos' such that:
|
||||
;; (equal (substring (substitute-in-file-name qstr) 0 upos)
|
||||
|
|
|
|||
|
|
@ -2303,9 +2303,6 @@ and selects that window."
|
|||
;; Few buffers--put them all in one pane.
|
||||
(list (cons title alist))))
|
||||
|
||||
(define-obsolete-function-alias
|
||||
'mouse-choose-completion 'choose-completion "23.2")
|
||||
|
||||
;; Font selection.
|
||||
|
||||
(defun font-menu-add-default ()
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ imenu."
|
|||
(define-key map "\e\C-e" 'antlr-end-of-rule)
|
||||
(define-key map "\C-c\C-a" 'antlr-beginning-of-body)
|
||||
(define-key map "\C-c\C-e" 'antlr-end-of-body)
|
||||
(define-key map "\C-c\C-f" 'c-forward-into-nomenclature)
|
||||
(define-key map "\C-c\C-f" 'subword-forward)
|
||||
(define-key map "\C-c\C-b" 'c-backward-into-nomenclature)
|
||||
(define-key map "\C-c\C-c" 'comment-region)
|
||||
(define-key map "\C-c\C-v" 'antlr-hide-actions)
|
||||
|
|
@ -745,7 +745,7 @@ imenu."
|
|||
["Backward Statement" c-beginning-of-statement t]
|
||||
["Forward Statement" c-end-of-statement t]
|
||||
["Backward Into Nomencl." c-backward-into-nomenclature t]
|
||||
["Forward Into Nomencl." c-forward-into-nomenclature t])
|
||||
["Forward Into Nomencl." subword-forward t])
|
||||
["Indent Region" indent-region
|
||||
:active (and (not buffer-read-only) (c-region-is-active-p))]
|
||||
["Comment Out Region" comment-region
|
||||
|
|
|
|||
|
|
@ -1554,19 +1554,6 @@ left out."
|
|||
(declare-function c-backward-subword "ext:cc-subword" (&optional arg))
|
||||
|
||||
;; "nomenclature" functions + c-scope-operator.
|
||||
(defun c-forward-into-nomenclature (&optional arg)
|
||||
"Compatibility alias for `c-forward-subword'."
|
||||
(interactive "p")
|
||||
(if (fboundp 'subword-mode)
|
||||
(progn
|
||||
(require 'subword)
|
||||
(subword-forward arg))
|
||||
(require 'cc-subword)
|
||||
(c-forward-subword arg)))
|
||||
(make-obsolete 'c-forward-into-nomenclature
|
||||
(if (fboundp 'subword-mode) 'subword-forward 'c-forward-subword)
|
||||
"23.2")
|
||||
|
||||
(defun c-backward-into-nomenclature (&optional arg)
|
||||
"Compatibility alias for `c-backward-subword'."
|
||||
(interactive "p")
|
||||
|
|
|
|||
|
|
@ -7042,12 +7042,10 @@ If these don't exist, a letter in the string is automatically selected."
|
|||
#'idlwave-make-modified-completion-map "28.1")
|
||||
|
||||
(defun idlwave-make-modified-completion-map (old-map)
|
||||
"Replace `choose-completion' and `mouse-choose-completion' in OLD-MAP."
|
||||
"Replace `choose-completion' in OLD-MAP."
|
||||
(let ((new-map (copy-keymap old-map)))
|
||||
(substitute-key-definition
|
||||
'choose-completion 'idlwave-choose-completion new-map)
|
||||
(substitute-key-definition
|
||||
'mouse-choose-completion 'idlwave-mouse-choose-completion new-map)
|
||||
(define-key new-map [mouse-3] 'idlwave-mouse-completion-help)
|
||||
new-map))
|
||||
|
||||
|
|
@ -7056,10 +7054,8 @@ If these don't exist, a letter in the string is automatically selected."
|
|||
(interactive (list last-nonmenu-event))
|
||||
(apply 'idlwave-choose 'choose-completion args))
|
||||
|
||||
(defun idlwave-mouse-choose-completion (&rest args)
|
||||
"Click on an alternative in the `*Completions*' buffer to choose it."
|
||||
(interactive "e")
|
||||
(apply 'idlwave-choose 'mouse-choose-completion args))
|
||||
(define-obsolete-function-alias 'idlwave-mouse-choose-completion
|
||||
#'idlwave-choose-completion "28.1")
|
||||
|
||||
;;----------------------------------------------------------------------
|
||||
;;----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -2304,10 +2304,6 @@ Ignore byte-compiler warnings you might see."
|
|||
(defvaralias 'vhdl-last-input-event 'last-input-char)
|
||||
(defvaralias 'vhdl-last-input-event 'last-input-event))
|
||||
|
||||
;; `help-print-return-message' changed to `print-help-return-message' in Emacs
|
||||
;;;(unless (fboundp 'help-print-return-message)
|
||||
;;; (defalias 'help-print-return-message 'print-help-return-message))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Compatibility with older VHDL Mode versions
|
||||
|
||||
|
|
|
|||
|
|
@ -446,8 +446,6 @@ Entry to this mode runs `scheme-mode-hook' and then
|
|||
(scheme-interaction-mode-initialize)
|
||||
(scheme-interaction-mode t)))))
|
||||
|
||||
(define-obsolete-function-alias 'advertised-xscheme-send-previous-expression
|
||||
'xscheme-send-previous-expression "23.2")
|
||||
|
||||
;;;; Debugger Mode
|
||||
|
||||
|
|
|
|||
|
|
@ -6122,8 +6122,6 @@ Does not set point. Does nothing if mark ring is empty."
|
|||
(pop mark-ring))
|
||||
(deactivate-mark))
|
||||
|
||||
(define-obsolete-function-alias
|
||||
'exchange-dot-and-mark 'exchange-point-and-mark "23.3")
|
||||
(defun exchange-point-and-mark (&optional arg)
|
||||
"Put the mark where point is now, and point where the mark is now.
|
||||
This command works even when the mark is not active,
|
||||
|
|
@ -8409,18 +8407,6 @@ Called with three arguments (BEG END TEXT), it should replace the text
|
|||
between BEG and END with TEXT. Expected to be set buffer-locally
|
||||
in the *Completions* buffer.")
|
||||
|
||||
(defvar completion-base-size nil
|
||||
"Number of chars before point not involved in completion.
|
||||
This is a local variable in the completion list buffer.
|
||||
It refers to the chars in the minibuffer if completing in the
|
||||
minibuffer, or in `completion-reference-buffer' otherwise.
|
||||
Only characters in the field at point are included.
|
||||
|
||||
If nil, Emacs determines which part of the tail end of the
|
||||
buffer's text is involved in completion by comparing the text
|
||||
directly.")
|
||||
(make-obsolete-variable 'completion-base-size 'completion-base-position "23.2")
|
||||
|
||||
(defun delete-completion-window ()
|
||||
"Delete the completion list window.
|
||||
Go to the window from which completion was requested."
|
||||
|
|
@ -8474,7 +8460,6 @@ If EVENT, use EVENT's position to determine the starting position."
|
|||
(run-hooks 'mouse-leave-buffer-hook)
|
||||
(with-current-buffer (window-buffer (posn-window (event-start event)))
|
||||
(let ((buffer completion-reference-buffer)
|
||||
(base-size completion-base-size)
|
||||
(base-position completion-base-position)
|
||||
(insert-function completion-list-insert-choice-function)
|
||||
(choice
|
||||
|
|
@ -8501,10 +8486,6 @@ If EVENT, use EVENT's position to determine the starting position."
|
|||
(choose-completion-string
|
||||
choice buffer
|
||||
(or base-position
|
||||
(when base-size
|
||||
;; Someone's using old completion code that doesn't know
|
||||
;; about base-position yet.
|
||||
(list (+ base-size (field-beginning))))
|
||||
;; If all else fails, just guess.
|
||||
(list (choose-completion-guess-base-position choice)))
|
||||
insert-function)))))
|
||||
|
|
@ -8532,10 +8513,6 @@ If EVENT, use EVENT's position to determine the starting position."
|
|||
(forward-char 1))
|
||||
(point))))
|
||||
|
||||
(defun choose-completion-delete-max-match (string)
|
||||
(declare (obsolete choose-completion-guess-base-position "23.2"))
|
||||
(delete-region (choose-completion-guess-base-position string) (point)))
|
||||
|
||||
(defvar choose-completion-string-functions nil
|
||||
"Functions that may override the normal insertion of a completion choice.
|
||||
These functions are called in order with three arguments:
|
||||
|
|
@ -8564,13 +8541,6 @@ back on `completion-list-insert-choice-function' when nil."
|
|||
;; unless it is reading a file name and CHOICE is a directory,
|
||||
;; or completion-no-auto-exit is non-nil.
|
||||
|
||||
;; Some older code may call us passing `base-size' instead of
|
||||
;; `base-position'. It's difficult to make any use of `base-size',
|
||||
;; so we just ignore it.
|
||||
(unless (consp base-position)
|
||||
(message "Obsolete `base-size' passed to choose-completion-string")
|
||||
(setq base-position nil))
|
||||
|
||||
(let* ((buffer (or buffer completion-reference-buffer))
|
||||
(mini-p (minibufferp buffer)))
|
||||
;; If BUFFER is a minibuffer, barf unless it's the currently
|
||||
|
|
@ -8626,8 +8596,7 @@ Type \\<completion-list-mode-map>\\[choose-completion] in the completion list\
|
|||
to select the completion near point.
|
||||
Or click to select one with the mouse.
|
||||
|
||||
\\{completion-list-mode-map}"
|
||||
(set (make-local-variable 'completion-base-size) nil))
|
||||
\\{completion-list-mode-map}")
|
||||
|
||||
(defun completion-list-mode-finish ()
|
||||
"Finish setup of the completions buffer.
|
||||
|
|
@ -8664,14 +8633,11 @@ Called from `temp-buffer-show-hook'."
|
|||
(if minibuffer-completing-file-name
|
||||
(file-name-as-directory
|
||||
(expand-file-name
|
||||
(buffer-substring (minibuffer-prompt-end)
|
||||
(- (point) (or completion-base-size 0))))))))
|
||||
(buffer-substring (minibuffer-prompt-end) (point)))))))
|
||||
(with-current-buffer standard-output
|
||||
(let ((base-size completion-base-size) ;Read before killing localvars.
|
||||
(base-position completion-base-position)
|
||||
(let ((base-position completion-base-position)
|
||||
(insert-fun completion-list-insert-choice-function))
|
||||
(completion-list-mode)
|
||||
(set (make-local-variable 'completion-base-size) base-size)
|
||||
(set (make-local-variable 'completion-base-position) base-position)
|
||||
(set (make-local-variable 'completion-list-insert-choice-function)
|
||||
insert-fun))
|
||||
|
|
|
|||
|
|
@ -4670,13 +4670,6 @@ This function is called directly from the C code."
|
|||
;; Finally, run any other hook.
|
||||
(run-hook-with-args 'after-load-functions abs-file))
|
||||
|
||||
(defun eval-next-after-load (file)
|
||||
"Read the following input sexp, and run it whenever FILE is loaded.
|
||||
This makes or adds to an entry on `after-load-alist'.
|
||||
FILE should be the name of a library, with no directory name."
|
||||
(declare (obsolete eval-after-load "23.2"))
|
||||
(eval-after-load file (read)))
|
||||
|
||||
|
||||
(defun display-delayed-warnings ()
|
||||
"Display delayed warnings from `delayed-warnings-list'.
|
||||
|
|
|
|||
49
lisp/term.el
49
lisp/term.el
|
|
@ -4110,53 +4110,6 @@ see `expand-file-name' and `substitute-in-file-name'. For completion see
|
|||
(term-dynamic-complete-filename))
|
||||
|
||||
|
||||
(defun term-dynamic-simple-complete (stub candidates)
|
||||
"Dynamically complete STUB from CANDIDATES list.
|
||||
This function inserts completion characters at point by completing STUB from
|
||||
the strings in CANDIDATES. A completions listing may be shown in a help buffer
|
||||
if completion is ambiguous.
|
||||
|
||||
Returns nil if no completion was inserted.
|
||||
Returns `sole' if completed with the only completion match.
|
||||
Returns `shortest' if completed with the shortest of the completion matches.
|
||||
Returns `partial' if completed as far as possible with the completion matches.
|
||||
Returns `listed' if a completion listing was shown.
|
||||
|
||||
See also `term-dynamic-complete-filename'."
|
||||
(declare (obsolete completion-in-region "23.2"))
|
||||
(let* ((completion-ignore-case nil)
|
||||
(completions (all-completions stub candidates)))
|
||||
(cond ((null completions)
|
||||
(message "No completions of %s" stub)
|
||||
nil)
|
||||
((= 1 (length completions)) ; Gotcha!
|
||||
(let ((completion (car completions)))
|
||||
(if (string-equal completion stub)
|
||||
(message "Sole completion")
|
||||
(insert (substring completion (length stub)))
|
||||
(message "Completed"))
|
||||
(when term-completion-addsuffix (insert " "))
|
||||
'sole))
|
||||
(t ; There's no unique completion.
|
||||
(let ((completion (try-completion stub candidates)))
|
||||
;; Insert the longest substring.
|
||||
(insert (substring completion (length stub)))
|
||||
(cond ((and term-completion-recexact term-completion-addsuffix
|
||||
(string-equal stub completion)
|
||||
(member completion completions))
|
||||
;; It's not unique, but user wants shortest match.
|
||||
(insert " ")
|
||||
(message "Completed shortest")
|
||||
'shortest)
|
||||
((or term-completion-autolist
|
||||
(string-equal stub completion))
|
||||
;; It's not unique, list possible completions.
|
||||
(term-dynamic-list-completions completions)
|
||||
'listed)
|
||||
(t
|
||||
(message "Partially completed")
|
||||
'partial)))))))
|
||||
|
||||
(defun term-dynamic-list-filename-completions ()
|
||||
"List in help buffer possible completions of the filename at point."
|
||||
(interactive)
|
||||
|
|
@ -4186,7 +4139,7 @@ Typing SPC flushes the help buffer."
|
|||
(eq (window-buffer (posn-window (event-start first)))
|
||||
(get-buffer "*Completions*"))
|
||||
(memq (key-binding key)
|
||||
'(mouse-choose-completion choose-completion))))
|
||||
'(choose-completion))))
|
||||
;; If the user does choose-completion with the mouse,
|
||||
;; execute the command, then delete the completion window.
|
||||
(progn
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue