diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-10 13:27:36 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-09 11:27:30 +0200 |
| commit | 1f29ee2d21b57e81a28550a1b31bc8a39406d17b (patch) | |
| tree | 753106efb2241a17c5949255b7b457f7ad210f77 | |
| parent | c6d8db8d91649d4e30bb26c662ac867136005c0c (diff) | |
| download | emacs-1f29ee2d21b57e81a28550a1b31bc8a39406d17b.tar.gz | |
Delete many items obsolete since 24.3
* lisp/allout.el (allout-exposure-change-hook)
(allout-structure-added-hook, allout-structure-deleted-hook)
(allout-structure-shifted-hook):
* lisp/arc-mode.el (archive-extract-hooks):
* lisp/buff-menu.el (Buffer-menu-buffer+size-width):
* lisp/calendar/timeclock.el (timeclock-modeline-display)
(timeclock-modeline-display, timeclock-update-modeline):
* lisp/cedet/semantic/db-el.el
(semanticdb-elisp-sym-function-arglist):
* lisp/cedet/semantic/db-file.el (semanticdb-save-database-hooks):
* lisp/cedet/semantic/edit.el (semantic-change-hooks)
(semantic-edits-new-change-hooks)
(semantic-edits-delete-change-hooks)
(semantic-edits-reparse-change-hooks):
* lisp/cedet/semantic/lex.el (semantic-lex-reset-hooks):
* lisp/comint.el (comint--unquote&expand-filename)
(comint-unquote-filename):
* lisp/custom.el (user-variable-p):
* lisp/dired.el (dired-shrink-to-fit, dired-pop-to-buffer)
(dired-sort-set-modeline):
* lisp/ebuff-menu.el (Electric-buffer-menu-mode):
* lisp/emacs-lisp/byte-run.el (macro-declaration-function):
* lisp/emacs-lisp/checkdoc.el (custom-print-functions)
(checkdoc-comment-style-hooks):
* lisp/emacs-lisp/cl-lib.el (custom-print-functions):
* lisp/emacs-lisp/edebug.el (gud-inhibit-global-bindings):
* lisp/erc/erc-dcc.el (erc-dcc-chat-filter-hook):
* lisp/eshell/esh-mode.el (eshell-status-in-modeline):
* lisp/eshell/eshell.el (eshell-add-to-window-buffer-names)
(eshell-remove-from-window-buffer-names):
* lisp/faces.el (set-face-underline-p, font-list-limit):
* lisp/files.el (automount-dir-prefix, toggle-read-only):
* lisp/filesets.el (filesets-cache-fill-content-hooks):
* lisp/frame.el (automatic-hscrolling):
* lisp/generic-x.el (javascript-generic-mode)
(javascript-generic-mode-hook):
* lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-hooks):
* lisp/gnus/nndiary.el (nndiary-request-create-group-hooks)
(nndiary-request-update-info-hooks)
(nndiary-request-accept-article-hooks):
* lisp/htmlfontify.el (hfy-post-html-hooks):
* lisp/international/mule-cmds.el
(inactivate-current-input-method-function)
(inactivate-input-method, input-method-inactivate-hook)
(ucs-insert):
* lisp/international/quail.el (quail-inactivate)
(quail-inactivate-hook):
* lisp/international/robin.el (robin-inactivate)
(robin-inactivate-hook):
* lisp/leim/quail/hangul.el (hangul-input-method-inactivate):
* lisp/leim/quail/uni-input.el (ucs-input-inactivate):
* lisp/mail/emacsbug.el (report-emacs-bug-info):
* lisp/mh-e/mh-e.el (mh-kill-folder-suppress-prompt-hooks):
* lisp/mpc.el (mpc-string-prefix-p):
* lisp/net/rcirc.el (rcirc-print-hooks, rcirc-sentinel-hooks)
(rcirc-receive-message-hooks, rcirc-activity-hooks):
* lisp/obsolete/crisp.el (crisp-mode-modeline-string):
* lisp/pcomplete.el (pcomplete-arg-quote-list)
(pcomplete-quote-argument):
* lisp/progmodes/cc-mode.el (c-prepare-bug-report-hooks):
* lisp/progmodes/python.el (python-info-ppss-context)
(python-info-ppss-context-type)
(python-info-ppss-comment-or-string-p, python-indent)
(python-guess-indent, python-buffer, python-preoutput-result)
(python-proc, python-send-receive, python-send-string)
(python-use-skeletons):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-interactive):
* lisp/strokes.el (strokes-modeline-string):
* lisp/subr.el (redraw-modeline):
* lisp/term.el (term-default-fg-color, term-default-bg-color):
* lisp/textmodes/tex-mode.el (latex-string-prefix-p)
(tex-string-prefix-p):
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/vc/add-log.el (change-log-acknowledgement):
* lisp/vc/ediff-wind.el
(ediff-choose-window-setup-function-automatically):
* lisp/vc/pcvs-util.el (cvs-string-prefix-p):
* lisp/vc/vc.el (vc-string-prefix-p):
* lisp/window.el (display-buffer-function):
* lisp/winner.el (winner-mode-leave-hook): Remove many functions and
variables obsolete since 24.3.
* lisp/buff-menu.el (list-buffers--refresh):
* lisp/dired.el (dired-mode-map):
* lisp/files.el (abbreviate-file-name):
* lisp/generic-x.el (generic-default-modes):
* lisp/mh-e/mh-funcs.el (mh-kill-folder):
* lisp/progmodes/hideif.el (hide-ifdef-mode-submap):
* lisp/replace.el (query-replace-read-from):
* lisp/term.el (term):
* lisp/window.el (display-buffer): Don't use above deleted
functions and variables.
* src/marker.c (Fbuffer_has_markers_at): Delete DEFUN obsolete
since 24.3.
(syms_of_marker) <Sbuffer_has_markers_at>: Delete defsubr.
* lisp/subr.el (buffer-has-markers-at): Remove obsoletion
of above deleted DEFUN.
* etc/TODO: Doc fix; don't mention above deleted function.
* admin/cus-test.el (cus-test-get-options):
* lisp/pcomplete.el: Doc fixes; don't mention removed items.
; * etc/NEWS: List removed items.
60 files changed, 207 insertions, 596 deletions
diff --git a/admin/cus-test.el b/admin/cus-test.el index 5894abed3df..22d5a3a1516 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -272,7 +272,7 @@ currently defined groups." (if group (memq symbol groups) (or - ;; (user-variable-p symbol) + ;; (custom-variable-p symbol) (get symbol 'standard-value) ;; (get symbol 'saved-value) (get symbol 'custom-type))) @@ -2621,55 +2621,102 @@ but switching to `ash` is generally much preferable. --- ** Some functions and variables obsolete since Emacs 24 have been removed: +'Buffer-menu-buffer+size-width', 'Electric-buffer-menu-mode', 'Info-edit-map', 'allout-abbreviate-flattened-numbering', -'allout-mode-deactivate-hook', 'ansi-color-unfontify-region', -'auth-source-forget-user-or-password', 'auth-source-hide-passwords', -'auth-source-user-or-password', 'bibtex-complete', -'bibtex-entry-field-alist', 'buffer-substring-filters', -'byte-compile-disable-print-circle', 'cfengine-mode-abbrevs', -'chart-map', 'comint-dynamic-complete', -'comint-dynamic-complete-as-filename', -'comint-dynamic-simple-complete', 'command-history-map', -'compilation-parse-errors-function', 'completion-annotate-function', -'condition-case-no-debug', 'count-lines-region', 'data-debug-map', -'deferred-action-list', 'deferred-action-function', -'dired-x-submit-report', 'eieio-defgeneric', 'eieio-defmethod', -'emacs-lock-from-exiting', 'erc-complete-word', -'eshell-cmpl-suffix-list', 'eshell-for', 'font-lock-maximum-size', +'allout-exposure-change-hook', 'allout-mode-deactivate-hook', +'allout-structure-added-hook', 'allout-structure-deleted-hook', +'allout-structure-shifted-hook', 'ansi-color-unfontify-region', +'archive-extract-hooks', 'auth-source-forget-user-or-password', +'auth-source-hide-passwords', 'auth-source-user-or-password', +'automatic-hscrolling', 'automount-dir-prefix', 'bibtex-complete', +'bibtex-entry-field-alist', 'buffer-has-markers-at', +'buffer-substring-filters', 'byte-compile-disable-print-circle', +'c-prepare-bug-report-hooks', 'cfengine-mode-abbrevs', +'change-log-acknowledgement', 'chart-map', +'checkdoc-comment-style-hooks', 'comint--unquote&expand-filename', +'comint-dynamic-complete', 'comint-dynamic-complete-as-filename', +'comint-dynamic-simple-complete', 'comint-unquote-filename', +'command-history-map', 'compilation-parse-errors-function', +'completion-annotate-function', 'condition-case-no-debug', +'count-lines-region', 'crisp-mode-modeline-string', +'custom-print-functions', 'custom-print-functions', +'cvs-string-prefix-p', 'data-debug-map', 'deferred-action-function', +'deferred-action-list', 'dired-pop-to-buffer', 'dired-shrink-to-fit', +'dired-sort-set-modeline', 'dired-x-submit-report', +'display-buffer-function', +'ediff-choose-window-setup-function-automatically', +'eieio-defgeneric', 'eieio-defmethod', 'emacs-lock-from-exiting', +'erc-complete-word', 'erc-dcc-chat-filter-hook', +'eshell-add-to-window-buffer-names', 'eshell-cmpl-suffix-list', +'eshell-for', 'eshell-remove-from-window-buffer-names', +'eshell-status-in-modeline', 'filesets-cache-fill-content-hooks', +'font-list-limit', 'font-lock-maximum-size', 'font-lock-reference-face', 'gnus-carpal', 'gnus-debug-exclude-variables', 'gnus-debug-files', 'gnus-local-domain', 'gnus-outgoing-message-group', -'gnus-secondary-servers', 'gnus-registry-user-format-function-M', +'gnus-registry-user-format-function-M', 'gnus-secondary-servers', +'gnus-subscribe-newsgroup-hooks', 'gud-inhibit-global-bindings', +'hangul-input-method-inactivate', 'hfy-post-html-hooks', 'image-extension-data', 'image-library-alist', +'inactivate-current-input-method-function', 'inactivate-input-method', 'inhibit-first-line-modes-regexps', -'inhibit-first-line-modes-suffixes', 'intdos', -'mail-complete-function', 'mail-completion-at-point-function', +'inhibit-first-line-modes-suffixes', 'input-method-inactivate-hook', +'intdos', 'javascript-generic-mode', 'javascript-generic-mode-hook', +'latex-string-prefix-p', 'macro-declaration-function' (function), +'macro-declaration-function' (variable), 'mail-complete-function', +'mail-completion-at-point-function', 'mail-mailer-swallows-blank-line', 'mail-sent-via', 'make-register', 'makefile-complete', 'menu-bar-kill-ring-save', 'meta-complete-symbol', 'meta-mode-map', +'mh-kill-folder-suppress-prompt-hooks', 'minibuffer-completing-symbol', 'minibuffer-local-filename-must-match-map', 'mode25', 'mode4350', -'msb-after-load-hooks', 'nnimap-split-rule', 'nntp-authinfo-file', -'ns-alternatives-map', 'ns-store-cut-buffer-internal', -'package-menu-view-commentary', 'pascal-last-completions', -'pascal-show-completions', 'pascal-toggle-completions', -'prolog-char-quote-workaround', 'read-filename-at-point', +'mpc-string-prefix-p', 'msb-after-load-hooks', +'nndiary-request-accept-article-hooks', +'nndiary-request-create-group-hooks', +'nndiary-request-update-info-hooks', 'nnimap-split-rule', +'nntp-authinfo-file', 'ns-alternatives-map', +'ns-store-cut-buffer-internal', 'package-menu-view-commentary', +'pascal-last-completions', 'pascal-show-completions', +'pascal-toggle-completions', 'pcomplete-arg-quote-list', +'pcomplete-quote-argument', 'prolog-char-quote-workaround', +'python-buffer, 'python-guess-indent', 'python-indent', +'python-info-ppss-comment-or-string-p', 'python-info-ppss-context', +'python-info-ppss-context-type', 'python-preoutput-result', +'python-proc', 'python-send-receive', 'python-send-string', +'python-use-skeletons', 'quail-inactivate', 'quail-inactivate-hook', +'query-replace-interactive', 'rcirc-activity-hooks', +'rcirc-print-hooks', 'rcirc-receive-message-hooks', +'rcirc-sentinel-hooks', 'read-filename-at-point', 'redraw-modeline', 'reftex-index-map', 'reftex-index-phrases-map', 'reftex-select-bib-map', 'reftex-select-label-map', 'reftex-toc-map', -'register-name-alist', 'register-value', +'register-name-alist', 'register-value', 'report-emacs-bug-info', 'report-emacs-bug-pretest-address', 'rmail-default-dont-reply-to-names', 'rmail-dont-reply-to', -'rmail-dont-reply-to-names', 'rst-block-face', 'rst-comment-face', +'rmail-dont-reply-to-names', 'robin-inactivate', +'robin-inactivate-hook', 'rst-block-face', 'rst-comment-face', 'rst-definition-face', 'rst-directive-face', 'rst-emphasis1-face', 'rst-emphasis2-face', 'rst-external-face', 'rst-literal-face', -'rst-reference-face', 'semantic-grammar-map', -'semantic-grammar-syntax-table', 'set-register-value', -'speedbar-key-map', 'speedbar-syntax-table', -'starttls-any-program-available', 'strokes-report-bug', +'rst-reference-face', 'semantic-change-hooks', +'semantic-edits-delete-change-hooks', +'semantic-edits-new-change-hooks', +'semantic-edits-reparse-change-hooks', 'semantic-grammar-map', +'semantic-grammar-syntax-table', 'semantic-lex-reset-hooks', +'semanticdb-elisp-sym-function-arglist', +'semanticdb-save-database-hooks', 'set-face-underline-p', +'set-register-value', 'sh-maybe-here-document', 'speedbar-key-map', +'speedbar-syntax-table', 'starttls-any-program-available', +'strokes-modeline-string', 'strokes-report-bug', +'term-default-bg-color', 'term-default-fg-color', +'tex-string-prefix-p', 'timeclock-modeline-display', +'timeclock-modeline-display', 'timeclock-update-modeline', 'toggle-emacs-lock', 'tooltip-use-echo-area', 'turn-on-cwarn-mode', -'turn-on-iimage-mode', 'vc-toggle-read-only', 'view-return-to-alist', +'turn-on-iimage-mode', 'ucs-input-inactivate', 'ucs-insert', +'url-recreate-url-attributes', 'user-variable-p', +'vc-string-prefix-p', 'vc-toggle-read-only', 'view-return-to-alist', 'view-return-to-alist-update', 'w32-default-color-map' (function), -'which-func-mode' (function), 'x-cut-buffer-or-selection-value'. +'which-func-mode' (function), 'winner-mode-leave-hook', +'x-cut-buffer-or-selection-value'. --- ** Some functions and variables obsolete since Emacs 23 have been removed: @@ -1481,8 +1481,8 @@ Markers are implemented as a non-sorted singly linked list of markers. This makes them scale badly when thousands of markers are created in a buffer for some purpose, because some low-level primitives in Emacs traverse the markers' list (e.g., when converting between character -and byte positions), and also because searching for a marker (e.g., -with 'buffer-has-markers-at') becomes very slow. +and byte positions), and also because searching for a marker becomes +very slow. **** Explore whether overlay-recenter can cure overlays performance problems diff --git a/lisp/allout.el b/lisp/allout.el index fb922608b0d..5f7087829e2 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1352,8 +1352,6 @@ their settings before `allout-mode' was started." "Symbol for use as allout invisible-text overlay category.") ;;;_ = allout-exposure-change-functions -(define-obsolete-variable-alias 'allout-exposure-change-hook - 'allout-exposure-change-functions "24.3") (defcustom allout-exposure-change-functions nil "Abnormal hook run after allout outline subtree exposure changes. It is run at the conclusion of `allout-flag-region'. @@ -1370,8 +1368,6 @@ This hook might be invoked multiple times by a single command." :version "24.3") ;;;_ = allout-structure-added-functions -(define-obsolete-variable-alias 'allout-structure-added-hook - 'allout-structure-added-functions "24.3") (defcustom allout-structure-added-functions nil "Abnormal hook run after adding items to an Allout outline. Functions on the hook should take two arguments: @@ -1385,8 +1381,6 @@ This hook might be invoked multiple times by a single command." :version "24.3") ;;;_ = allout-structure-deleted-functions -(define-obsolete-variable-alias 'allout-structure-deleted-hook - 'allout-structure-deleted-functions "24.3") (defcustom allout-structure-deleted-functions nil "Abnormal hook run after deleting subtrees from an Allout outline. Functions on the hook must take two arguments: @@ -1403,8 +1397,6 @@ This hook might be invoked multiple times by a single command." :version "24.3") ;;;_ = allout-structure-shifted-functions -(define-obsolete-variable-alias 'allout-structure-shifted-hook - 'allout-structure-shifted-functions "24.3") (defcustom allout-structure-shifted-functions nil "Abnormal hook run after shifting items in an Allout outline. Functions on the hook should take two arguments: diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 632ae578523..b6f7794e337 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -125,8 +125,6 @@ A non-local file is one whose file name is not proper outside Emacs. A local copy of the archive will be used when updating." :type 'regexp) -(define-obsolete-variable-alias 'archive-extract-hooks - 'archive-extract-hook "24.3") (defcustom archive-extract-hook nil "Hook run when an archive member has been extracted." :type 'hook) diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 539ef673f0b..abf152f058c 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -54,21 +54,6 @@ :group 'Buffer-menu) (put 'Buffer-menu-buffer 'face-alias 'buffer-menu-buffer) -(defcustom Buffer-menu-buffer+size-width nil - "Combined width of buffer name and size columns in Buffer Menu. -If nil, use `Buffer-menu-name-width' and `Buffer-menu-size-width'. - -If non-nil, the value of `Buffer-menu-name-width' is overridden; -the name column is assigned width `Buffer-menu-buffer+size-width' -minus `Buffer-menu-size-width'. This use is deprecated." - :type '(choice (const nil) number) - :group 'Buffer-menu - :version "24.3") - -(make-obsolete-variable 'Buffer-menu-buffer+size-width - "use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead." - "24.3") - (defun Buffer-menu--dynamic-name-width (buffers) "Return a name column width based on the current window width. The width will never exceed the actual width of the buffer names, @@ -679,9 +664,6 @@ means list those buffers and no others." (setq name-width (if (functionp Buffer-menu-name-width) (funcall Buffer-menu-name-width (mapcar #'car entries)) Buffer-menu-name-width)) - ;; Handle obsolete variable: - (if Buffer-menu-buffer+size-width - (setq name-width (- Buffer-menu-buffer+size-width size-width))) (setq tabulated-list-format (vector '("C" 1 t :pad-right 0) '("R" 1 t :pad-right 0) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 6b6cc517a20..e36119984be 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -137,9 +137,6 @@ This variable only has effect if set with \\[customize]." (defvar timeclock-update-timer nil "The timer used to update `timeclock-mode-string'.") -(define-obsolete-variable-alias 'timeclock-modeline-display - 'timeclock-mode-line-display "24.3") - ;; For byte-compiler. (defvar display-time-hook) (defvar timeclock-mode-line-display) @@ -259,9 +256,6 @@ The time is bracketed by <> if you are clocked in, otherwise by [].") ;;; User Functions: -(define-obsolete-function-alias 'timeclock-modeline-display - 'timeclock-mode-line-display "24.3") - ;;;###autoload (define-minor-mode timeclock-mode-line-display "Toggle display of the amount of time left today in the mode line. @@ -612,9 +606,6 @@ arguments of `completing-read'." "Ask the user for the reason they are clocking out." (completing-read "Reason for clocking out: " timeclock-reason-list)) -(define-obsolete-function-alias 'timeclock-update-modeline - 'timeclock-update-mode-line "24.3") - (defun timeclock-update-mode-line () "Update the `timeclock-mode-string' displayed in the mode line. The value of `timeclock-relative' affects the display as described in diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index 02ebde40785..f72e2069089 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -342,9 +342,6 @@ Return a list of tags." ) taglst)))) -(define-obsolete-function-alias 'semanticdb-elisp-sym-function-arglist - #'help-function-arglist "24.3") - (provide 'semantic/db-el) ;;; semantic/db-el.el ends here diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index e2c9d618ba2..0fc6806e403 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -70,8 +70,6 @@ passes a list of predicates in `semanticdb-project-predicate-functions'." :type '(repeat (choice (string :tag "Directory") (const never) (const always) (const project)))) -(define-obsolete-variable-alias 'semanticdb-save-database-hooks - 'semanticdb-save-database-functions "24.3") (defcustom semanticdb-save-database-functions nil "Abnormal hook run after a database is saved. Each function is called with one argument, the object representing diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 4679500ed99..7cb6768f7e1 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -72,8 +72,6 @@ updated in the current buffer. For language specific hooks, make sure you define this as a local hook.") -(define-obsolete-variable-alias 'semantic-change-hooks - 'semantic-change-functions "24.3") (defvar semantic-change-functions '(semantic-edits-change-function-handle-changes) "Abnormal hook run when semantic detects a change in a buffer. @@ -91,14 +89,10 @@ If the hook returns non-nil, then declare that a reparse is needed. For language specific hooks, make sure you define this as a local hook. Not used yet; part of the next generation reparse mechanism.") -(define-obsolete-variable-alias 'semantic-edits-new-change-hooks - 'semantic-edits-new-change-functions "24.3") (defvar semantic-edits-new-change-functions nil "Abnormal hook run when a new change is found. Functions must take one argument representing an overlay on that change.") -(define-obsolete-variable-alias 'semantic-edits-delete-change-hooks - 'semantic-edits-delete-change-functions "24.3") (defvar semantic-edits-delete-change-functions nil "Abnormal hook run before a change overlay is deleted. Deleted changes occur when multiple changes are merged. @@ -110,8 +104,6 @@ Changes move when a new change overlaps an old change. The old change will be moved. Functions must take one argument representing an overlay being moved.") -(define-obsolete-variable-alias 'semantic-edits-reparse-change-hooks - 'semantic-edits-reparse-change-functions "24.3") (defvar semantic-edits-reparse-change-functions nil "Abnormal hook run after a change results in a reparse. Functions are called before the overlay is deleted, and after the diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 75c4ee328d6..b3c9e96538c 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -718,8 +718,6 @@ This is an alist of (ANCHOR . STREAM) elements where ANCHOR is the start position of the block, and STREAM is the list of tokens in that block.") -(define-obsolete-variable-alias 'semantic-lex-reset-hooks - 'semantic-lex-reset-functions "24.3") (defvar semantic-lex-reset-functions nil "Abnormal hook used by major-modes to reset lexical analyzers. Hook functions are called with START and END values for the diff --git a/lisp/comint.el b/lisp/comint.el index 3ed04f098c7..8786c6db4b3 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3268,8 +3268,6 @@ See `comint-word'." (defun comint--unquote-argument (str) (car (comint--unquote&requote-argument str))) -(define-obsolete-function-alias 'comint--unquote&expand-filename - #'comint--unquote-argument "24.3") (defun comint-match-partial-filename () "Return the unquoted&expanded filename at point, or nil if none is found. @@ -3290,14 +3288,6 @@ Magic characters are those in `comint-file-name-quote-list'." (setq i (1+ (match-end 0))))) filename)))) -(defun comint-unquote-filename (filename) - "Return FILENAME with quoted characters unquoted." - (declare (obsolete nil "24.3")) - (if (null comint-file-name-quote-list) - filename - (save-match-data - (replace-regexp-in-string "\\\\\\(.\\)" "\\1" filename t)))) - (defun comint--requote-argument (upos qstr) ;; See `completion-table-with-quoting'. (let ((res (comint--unquote&requote-argument qstr upos))) diff --git a/lisp/custom.el b/lisp/custom.el index 96dfb37d862..352b5b0e160 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -674,8 +674,6 @@ property, or (ii) an alias for another customizable variable." "Return the standard value of VARIABLE." (eval (car (get variable 'standard-value)) t)) -(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.3") - (defun custom-note-var-changed (variable) "Inform Custom that VARIABLE has been set (changed). VARIABLE is a symbol that names a user option. diff --git a/lisp/dired.el b/lisp/dired.el index facfb35ab45..b9e89292e25 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -508,15 +508,6 @@ This is what the do-commands look for, and what the mark-commands store.") (defvar dired-del-marker ?D "Character used to flag files for deletion.") -(defvar dired-shrink-to-fit t - ;; I see no reason ever to make this nil -- rms. - ;; (> baud-rate search-slow-speed) - "Non-nil means Dired shrinks the display buffer to fit the marked files.") -(make-obsolete-variable 'dired-shrink-to-fit - "use the Customization interface to add a new rule -to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\", -action argument symbol is `window-height' and its value is nil." "24.3") - (defvar dired-file-version-alist) ;;;###autoload @@ -2259,8 +2250,6 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." "M-s f C-M-s" #'dired-isearch-filenames-regexp ;; misc "<remap> <read-only-mode>" #'dired-toggle-read-only - ;; `toggle-read-only' is an obsolete alias for `read-only-mode' - "<remap> <toggle-read-only>" #'dired-toggle-read-only "?" #'dired-summary "DEL" #'dired-unmark-backward "<remap> <undo>" #'dired-undo @@ -3879,28 +3868,6 @@ or \"* [3 files]\"." (format "[next %d files]" arg) (format "%c [%d files]" dired-marker-char count))))) -(defun dired-pop-to-buffer (buf) - "Pop up buffer BUF in a way suitable for Dired." - (declare (obsolete pop-to-buffer "24.3")) - (let ((split-window-preferred-function - (lambda (window) - (or (and (let ((split-height-threshold 0)) - (window-splittable-p (selected-window))) - ;; Try to split the selected window vertically if - ;; that's possible. (Bug#1806) - (split-window-below)) - ;; Otherwise, try to split WINDOW sensibly. - (split-window-sensibly window)))) - pop-up-frames) - (pop-to-buffer (get-buffer-create buf))) - ;; See Bug#12281. - (set-window-start nil (point-min)) - ;; If dired-shrink-to-fit is t, make its window fit its contents. - (when dired-shrink-to-fit - ;; Try to not delete window when we want to display less than - ;; `window-min-height' lines. - (fit-window-to-buffer (get-buffer-window buf) nil 1 nil nil t))) - (defcustom dired-no-confirm nil "A list of symbols for commands Dired should not confirm, or t. Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress', @@ -4590,9 +4557,6 @@ Possible values: (t (concat "Dired " dired-actual-switches)))))) (force-mode-line-update))) -(define-obsolete-function-alias 'dired-sort-set-modeline - #'dired-sort-set-mode-line "24.3") - (defun dired-sort-toggle-or-edit (&optional arg) "Toggle sorting by date, and refresh the Dired buffer. With a prefix argument, edit the current listing switches instead." diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 2b1fc916d9f..809a31d4573 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -203,9 +203,6 @@ See the documentation of `electric-buffer-list' for details." (setq mode-line-buffer-identification "Electric Buffer List") (setq-local Helper-return-blurb "return to buffer editing")) -(define-obsolete-function-alias 'Electric-buffer-menu-mode - #'electric-buffer-menu-mode "24.3") - ;; generally the same as Buffer-menu-mode-map ;; (except we don't indirect to global-map) (put 'Electric-buffer-menu-undefined 'suppress-keymap t) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 9a56ba0f7ad..9db84c31b88 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -112,44 +112,6 @@ So far, FUNCTION can only be a symbol, not a lambda expression." (function-put 'defmacro 'doc-string-elt 3) (function-put 'defmacro 'lisp-indent-function 2) -;; `macro-declaration-function' are both obsolete (as marked at the end of this -;; file) but used in many .elc files. - -;; We don't use #' here, because it's an obsolete function, and we -;; can't use `with-suppressed-warnings' here due to how this file is -;; used in the bootstrapping process. -(defvar macro-declaration-function 'macro-declaration-function - "Function to process declarations in a macro definition. -The function will be called with two args MACRO and DECL. -MACRO is the name of the macro being defined. -DECL is a list `(declare ...)' containing the declarations. -The value the function returns is not used.") - -(defalias 'macro-declaration-function - #'(lambda (macro decl) - "Process a declaration found in a macro definition. -This is set as the value of the variable `macro-declaration-function'. -MACRO is the name of the macro being defined. -DECL is a list `(declare ...)' containing the declarations. -The return value of this function is not used." - ;; We can't use `dolist' or `cadr' yet for bootstrapping reasons. - (let (d) - ;; Ignore the first element of `decl' (it's always `declare'). - (while (setq decl (cdr decl)) - (setq d (car decl)) - (if (and (consp d) - (listp (cdr d)) - (null (cdr (cdr d)))) - (cond ((eq (car d) 'indent) - (put macro 'lisp-indent-function (car (cdr d)))) - ((eq (car d) 'debug) - (put macro 'edebug-form-spec (car (cdr d)))) - ((eq (car d) 'doc-string) - (put macro 'doc-string-elt (car (cdr d)))) - (t - (message "Unknown declaration %s" d))) - (message "Invalid declaration %s" d)))))) - ;; We define macro-declaration-alist here because it is needed to ;; handle declarations in macro definitions and this is the first file ;; loaded by loadup.el that uses declarations in macros. We specify @@ -771,9 +733,4 @@ type is. This defaults to \"INFO\"." ;; (file-format emacs19))" ;; nil) -(make-obsolete-variable 'macro-declaration-function - 'macro-declarations-alist "24.3") -(make-obsolete 'macro-declaration-function - 'macro-declarations-alist "24.3") - ;;; byte-run.el ends here diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index a5ab3a50ff2..20d64b59158 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -281,8 +281,6 @@ Currently, all recognized keywords must be on `finder-known-keywords'." :version "25.1" :type 'boolean) -(define-obsolete-variable-alias 'checkdoc-style-hooks - 'checkdoc-style-functions "24.3") (defvar checkdoc-style-functions nil "Hook run after the standard style check is completed. All functions must return nil or a string representing the error found. @@ -292,8 +290,6 @@ Each hook is called with two parameters, (DEFUNINFO ENDPOINT). DEFUNINFO is the return value of `checkdoc-defun-info'. ENDPOINT is the location of end of the documentation string.") -(define-obsolete-variable-alias 'checkdoc-comment-style-hooks - 'checkdoc-comment-style-functions "24.3") (defvar checkdoc-comment-style-functions nil "Hook run after the standard comment style check is completed. Must return nil if no errors are found, or a string describing the diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index a54fa21fa96..b83b44974d3 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -90,12 +90,6 @@ (defvar cl--optimize-safety 1) ;;;###autoload -(define-obsolete-variable-alias - ;; This alias is needed for compatibility with .elc files that use defstruct - ;; and were compiled with Emacs<24.3. - 'custom-print-functions 'cl-custom-print-functions "24.3") - -;;;###autoload (defvar cl-custom-print-functions nil "This is a list of functions that format user objects for printing. Each function is called in turn with three arguments: the object, the diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 9de8999fdfd..763848c0c9b 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -3791,9 +3791,6 @@ limited by `edebug-print-length' or `edebug-print-level'." ;;; Edebug Minor Mode -(define-obsolete-variable-alias 'gud-inhibit-global-bindings - 'edebug-inhibit-emacs-lisp-mode-bindings "24.3") - (defvar edebug-inhibit-emacs-lisp-mode-bindings nil "If non-nil, inhibit Edebug bindings on the C-x C-a key. By default, loading the `edebug' library causes these bindings to diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index dd70bfb7b70..90a10766c4c 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -1108,9 +1108,6 @@ Possible values are: ask, auto, ignore." (pcomplete-here '("auto" "ask" "ignore"))) (defalias 'pcomplete/erc-mode/SREQ #'pcomplete/erc-mode/CREQ) -(define-obsolete-variable-alias 'erc-dcc-chat-filter-hook - 'erc-dcc-chat-filter-functions "24.3") - (defvar erc-dcc-chat-filter-functions '(erc-dcc-chat-parse-output) "Abnormal hook run after parsing (and maybe inserting) a DCC message. Each function is called with two arguments: the ERC process and diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index ecbcf88b973..69069183a3f 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -175,9 +175,6 @@ This is used by `eshell-watch-for-password-prompt'." "A function called from beginning of line to skip the prompt." :type '(choice (const nil) function)) -(define-obsolete-variable-alias 'eshell-status-in-modeline - 'eshell-status-in-mode-line "24.3") - (defcustom eshell-status-in-mode-line t "If non-nil, let the user know a command is running in the mode line." :type 'boolean) diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 2c472a2afad..e0c927cad41 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -194,17 +194,6 @@ shells such as bash, zsh, rc, 4dos." ;; The following user options modify the behavior of Eshell overall. (defvar eshell-buffer-name) -(defun eshell-add-to-window-buffer-names () - "Add `eshell-buffer-name' to `same-window-buffer-names'." - (declare (obsolete nil "24.3")) - (add-to-list 'same-window-buffer-names eshell-buffer-name)) - -(defun eshell-remove-from-window-buffer-names () - "Remove `eshell-buffer-name' from `same-window-buffer-names'." - (declare (obsolete nil "24.3")) - (setq same-window-buffer-names - (delete eshell-buffer-name same-window-buffer-names))) - (defcustom eshell-load-hook nil "A hook run once Eshell has been loaded." :type 'hook diff --git a/lisp/faces.el b/lisp/faces.el index f1d8f82fec5..e171b32e317 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1001,9 +1001,6 @@ Use `set-face-attribute' to \"unspecify\" underlining." (interactive (read-face-and-attribute :underline)) (set-face-attribute face frame :underline underline)) -(define-obsolete-function-alias 'set-face-underline-p - 'set-face-underline "24.3") - (defun set-face-inverse-video (face inverse-video-p &optional frame) "Specify whether face FACE is in inverse video. @@ -3174,12 +3171,6 @@ also the same size as FACE on FRAME, or fail." (car fonts)) (frame-parameter nil 'font))) -(defcustom font-list-limit 100 - "This variable is obsolete and has no effect." - :type 'integer - :group 'display) -(make-obsolete-variable 'font-list-limit nil "24.3") - (define-obsolete-function-alias 'face-background-pixmap #'face-stipple "29.1") (define-obsolete-function-alias 'set-face-background-pixmap #'set-face-stipple "29.1") diff --git a/lisp/files.el b/lisp/files.el index b084dca8b7d..540bc2a6a85 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2079,12 +2079,6 @@ this function prepends a \"|\" to the final result if necessary." (uniquify--create-file-buffer-advice buf filename) buf)) -(defcustom automount-dir-prefix (purecopy "^/tmp_mnt/") - "Regexp to match the automounter prefix in a directory name." - :group 'files - :type 'regexp) -(make-obsolete-variable 'automount-dir-prefix 'directory-abbrev-alist "24.3") - (defvar abbreviated-home-dir nil "Regexp matching the user's homedir at the beginning of file name. The value includes abbreviation according to `directory-abbrev-alist'.") @@ -2092,8 +2086,7 @@ The value includes abbreviation according to `directory-abbrev-alist'.") (defun abbreviate-file-name (filename) "Return a version of FILENAME shortened using `directory-abbrev-alist'. This also substitutes \"~\" for the user's home directory (unless the -home directory is a root directory) and removes automounter prefixes -\(see the variable `automount-dir-prefix'). +home directory is a root directory). When this function is first called, it caches the user's home directory as a regexp in `abbreviated-home-dir', and reuses it @@ -2104,11 +2097,6 @@ started Emacs, set `abbreviated-home-dir' to nil so it will be recalculated)." (save-match-data ;FIXME: Why? (if-let ((handler (find-file-name-handler filename 'abbreviate-file-name))) (funcall handler 'abbreviate-file-name filename) - (if (and automount-dir-prefix - (string-match automount-dir-prefix filename) - (file-exists-p (file-name-directory - (substring filename (1- (match-end 0)))))) - (setq filename (substring filename (1- (match-end 0))))) ;; Avoid treating /home/foo as /home/Foo during `~' substitution. (let ((case-fold-search (file-name-case-insensitive-p filename))) ;; If any elt of directory-abbrev-alist matches this name, @@ -6100,14 +6088,6 @@ prints a message in the minibuffer. Instead, use `set-buffer-modified-p'." "Modification-flag cleared")) (set-buffer-modified-p arg)) -(defun toggle-read-only (&optional arg interactive) - "Change whether this buffer is read-only." - (declare (obsolete read-only-mode "24.3")) - (interactive (list current-prefix-arg t)) - (if interactive - (call-interactively 'read-only-mode) - (read-only-mode (or arg 'toggle)))) - (defun insert-file (filename) "Insert contents of file FILENAME into buffer after point. Set mark after the inserted text. diff --git a/lisp/filesets.el b/lisp/filesets.el index 4831bf167dd..aeebd907c35 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -358,8 +358,6 @@ Don't forget to check out `filesets-menu-ensure-use-cached'." :value filesets-be-docile-flag) (sexp :tag "Other" :value nil)))) -(define-obsolete-variable-alias 'filesets-cache-fill-content-hooks - 'filesets-cache-fill-content-hook "24.3") (defcustom filesets-cache-fill-content-hook nil "Hook run when writing the contents of filesets' cache file. diff --git a/lisp/frame.el b/lisp/frame.el index 9476cb0ec46..9361683c28a 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -3048,10 +3048,6 @@ See also `toggle-frame-maximized'." ;; Misc. -;; Only marked as obsolete in 24.3. -(define-obsolete-variable-alias 'automatic-hscrolling - 'auto-hscroll-mode "22.1") - (make-variable-buffer-local 'show-trailing-whitespace) ;; Defined in dispnew.c. diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 2c9d1b316e1..bbc90493afe 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -193,7 +193,6 @@ This hook will be installed if the variable hosts-generic-mode java-manifest-generic-mode java-properties-generic-mode - javascript-generic-mode show-tabs-generic-mode vrml-generic-mode) "List of generic modes that are defined by default.") @@ -489,12 +488,6 @@ like an INI file. You can add this hook to `find-file-hook'." nil "Generic mode for Sys V pkginfo files.")) -;; Javascript mode -;; Obsolete; defer to js-mode from js.el. -(when (memq 'javascript-generic-mode generic-extras-enable-list) - (define-obsolete-function-alias 'javascript-generic-mode 'js-mode "24.3") - (define-obsolete-variable-alias 'javascript-generic-mode-hook 'js-mode-hook "24.3")) - ;; VRML files (when (memq 'vrml-generic-mode generic-extras-enable-list) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 7700e6bd430..8d9e50059fd 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -294,8 +294,6 @@ claim them." function (repeat function))) -(define-obsolete-variable-alias 'gnus-subscribe-newsgroup-hooks - 'gnus-subscribe-newsgroup-functions "24.3") (defcustom gnus-subscribe-newsgroup-functions nil "Hooks run after you subscribe to a new group. The hooks will be called with new group's name as argument." diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 27204b3618a..ab9c6dd74f9 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -165,22 +165,16 @@ In order to make this clear, here are some examples: :type 'boolean) -(define-obsolete-variable-alias 'nndiary-request-create-group-hooks - 'nndiary-request-create-group-functions "24.3") (defcustom nndiary-request-create-group-functions nil "Hook run after `nndiary-request-create-group' is executed. The hook functions will be called with the full group name as argument." :type 'hook) -(define-obsolete-variable-alias 'nndiary-request-update-info-hooks - 'nndiary-request-update-info-functions "24.3") (defcustom nndiary-request-update-info-functions nil "Hook run after `nndiary-request-update-info' is executed. The hook functions will be called with the full group name as argument." :type 'hook) -(define-obsolete-variable-alias 'nndiary-request-accept-article-hooks - 'nndiary-request-accept-article-functions "24.3") (defcustom nndiary-request-accept-article-functions nil "Hook run before accepting an article. Executed near the beginning of `nndiary-request-accept-article'. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index bf7446f151a..b1fdbd2c4a3 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -226,7 +226,6 @@ to make them safe." :tag "html-quote-regex" :type '(regexp)) -(define-obsolete-variable-alias 'hfy-post-html-hooks 'hfy-post-html-hook "24.3") (defcustom hfy-post-html-hook nil "List of functions to call after creating and filling the HTML buffer. These functions will be called with the HTML buffer as the current buffer." diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 41376425289..e1d0df6e3ed 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1389,9 +1389,6 @@ Maximum length of the history list is determined by the value of `history-length', which see.") (put 'input-method-history 'permanent-local t) -(define-obsolete-variable-alias - 'inactivate-current-input-method-function - 'deactivate-current-input-method-function "24.3") (defvar-local deactivate-current-input-method-function nil "Function to call for deactivating the current input method. Every input method should set this to an appropriate value when activated. @@ -1524,10 +1521,6 @@ If INPUT-METHOD is nil, deactivate any current input method." (setq current-input-method nil) (force-mode-line-update))))) -(define-obsolete-function-alias - 'inactivate-input-method - 'deactivate-input-method "24.3") - (defun set-input-method (input-method &optional interactive) "Select and activate input method INPUT-METHOD for the current buffer. This also sets the default input method to the one you specify. @@ -1741,10 +1734,6 @@ just activated." :type 'hook :group 'mule) -(define-obsolete-variable-alias - 'input-method-inactivate-hook - 'input-method-deactivate-hook "24.3") - (defcustom input-method-deactivate-hook nil "Normal hook run just after an input method is deactivated. @@ -3254,7 +3243,6 @@ single characters to be treated as standing for themselves." (error "Invalid character")) char)) -(define-obsolete-function-alias 'ucs-insert 'insert-char "24.3") (define-key ctl-x-map "8\r" 'insert-char) (define-key ctl-x-map "8e" (define-keymap diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 4bb6dbcc8e4..e2ba485bbea 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -540,8 +540,6 @@ This function runs the normal hook `quail-deactivate-hook'." (interactive) (quail-activate -1)) -(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "24.3") - (defun quail-activate (&optional arg) "Activate Quail input method. With ARG, activate Quail input method if and only if arg is positive. @@ -583,10 +581,6 @@ While this input method is active, the variable (run-hooks 'quail-activate-hook) (setq-local input-method-function #'quail-input-method))) -(define-obsolete-variable-alias - 'quail-inactivate-hook - 'quail-deactivate-hook "24.3") - (defun quail-exit-from-minibuffer () (deactivate-input-method) (if (<= (minibuffer-depth) 1) diff --git a/lisp/international/robin.el b/lisp/international/robin.el index 4c498d7f923..9f0ff80e62e 100644 --- a/lisp/international/robin.el +++ b/lisp/international/robin.el @@ -393,8 +393,6 @@ A nil value means no package is selected.") (interactive) (robin-activate -1)) -(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.3") - (defun robin-activate (&optional arg) "Activate robin input method. @@ -423,10 +421,6 @@ While this input method is active, the variable 'robin-activate-hook) (setq-local input-method-function 'robin-input-method))) -(define-obsolete-variable-alias - 'robin-inactivate-hook - 'robin-deactivate-hook "24.3") - (defun robin-exit-from-minibuffer () (deactivate-input-method) (if (<= (minibuffer-depth) 1) diff --git a/lisp/leim/quail/hangul.el b/lisp/leim/quail/hangul.el index 83fee1e04c3..89b9abe137e 100644 --- a/lisp/leim/quail/hangul.el +++ b/lisp/leim/quail/hangul.el @@ -537,10 +537,6 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'." (setq describe-current-input-method-function nil)) (kill-local-variable 'input-method-function))) -(define-obsolete-function-alias - 'hangul-input-method-inactivate - #'hangul-input-method-deactivate "24.3") - (defun hangul-input-method-help () "Describe the current Hangul input method." (interactive) diff --git a/lisp/leim/quail/uni-input.el b/lisp/leim/quail/uni-input.el index 36d8e6a8404..3f10b873a34 100644 --- a/lisp/leim/quail/uni-input.el +++ b/lisp/leim/quail/uni-input.el @@ -113,10 +113,6 @@ While this input method is active, the variable (interactive) (ucs-input-activate -1)) -(define-obsolete-function-alias - 'ucs-input-inactivate - #'ucs-input-deactivate "24.3") - (defun ucs-input-help () (interactive) (with-output-to-temp-buffer "*Help*" diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index d72809b186d..a85ceaf1a5a 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -414,8 +414,6 @@ copy text to your preferred mail program.\n" system-configuration-options "'\n\n") (fill-region (line-beginning-position -1) (point)))) -(define-obsolete-function-alias 'report-emacs-bug-info #'info-emacs-bug "24.3") - (defun report-emacs-bug-hook () "Do some checking before sending a bug report." (goto-char (point-max)) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index f6031df9c24..0ad934107d3 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -3183,8 +3183,6 @@ function used to insert the signature with :group 'mh-letter :package-version '(MH-E . "8.0")) -(define-obsolete-variable-alias 'mh-kill-folder-suppress-prompt-hooks - 'mh-kill-folder-suppress-prompt-functions "24.3") (defcustom mh-kill-folder-suppress-prompt-functions '(mh-search-p) "Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder]. diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el index ab89ef2a3d1..4956d9b59fd 100644 --- a/lisp/mh-e/mh-funcs.el +++ b/lisp/mh-e/mh-funcs.el @@ -101,7 +101,7 @@ a non-nil value to suppress the normal prompt when you remove a folder. This is useful for folders that are easily regenerated." (interactive) (if (or (run-hook-with-args-until-success - 'mh-kill-folder-suppress-prompt-hooks) + 'mh-kill-folder-suppress-prompt-functions) (yes-or-no-p (format "Remove folder %s (and all included messages)? " mh-current-folder))) (let ((folder mh-current-folder) diff --git a/lisp/mpc.el b/lisp/mpc.el index ba95308bf67..1775e7d5e72 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -182,8 +182,6 @@ numerically rather than lexicographically." (abs res)) res)))))))) -(define-obsolete-function-alias 'mpc-string-prefix-p #'string-prefix-p "24.3") - ;; This can speed up mpc--song-search significantly. The table may grow ;; very large, tho. It's only bounded by the fact that it gets flushed ;; whenever the connection is established; which seems to work OK thanks diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index fcef3f10104..abb67da95f0 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -350,8 +350,6 @@ See `rcirc-bright-nick' face." See `rcirc-dim-nick' face." :type '(repeat string)) -(define-obsolete-variable-alias 'rcirc-print-hooks - 'rcirc-print-functions "24.3") (defcustom rcirc-print-functions nil "Hook run after text is printed. Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." @@ -832,8 +830,6 @@ is moved to after the text inserted. Otherwise the point is not moved." text)) (goto-char old))))) -(define-obsolete-variable-alias 'rcirc-sentinel-hooks - 'rcirc-sentinel-functions "24.3") (defvar rcirc-sentinel-functions nil "Hook functions called when the process sentinel is called. Functions are called with PROCESS and SENTINEL arguments.") @@ -974,8 +970,6 @@ If BUFFER is nil, default to the current buffer." (process-list)) ps)) -(define-obsolete-variable-alias 'rcirc-receive-message-hooks - 'rcirc-receive-message-functions "24.3") (defvar rcirc-receive-message-functions nil "Hook functions run when a message is received from server. Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") @@ -2375,8 +2369,6 @@ With prefix ARG, go to the next low priority buffer with activity." "")))) (rcirc-update-activity-string)) -(define-obsolete-variable-alias 'rcirc-activity-hooks - 'rcirc-activity-functions "24.3") (defvar rcirc-activity-functions nil "Hook to be run when there is channel activity. diff --git a/lisp/obsolete/crisp.el b/lisp/obsolete/crisp.el index 8424c42b69c..5e1a278a2c2 100644 --- a/lisp/obsolete/crisp.el +++ b/lisp/obsolete/crisp.el @@ -174,9 +174,6 @@ All the bindings are done here instead of globally to try and be nice to the world.") -(define-obsolete-variable-alias 'crisp-mode-modeline-string - 'crisp-mode-mode-line-string "24.3") - (defcustom crisp-mode-mode-line-string " *CRiSP*" "String to display in the mode line when CRiSP emulation mode is enabled." :type 'string) diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 15b9880df85..0e3d1df7814 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -155,9 +155,6 @@ This mirrors the optional behavior of tcsh. A non-nil value is useful if `pcomplete-autolist' is non-nil too." :type 'boolean) -(define-obsolete-variable-alias - 'pcomplete-arg-quote-list 'comint-file-name-quote-list "24.3") - (defcustom pcomplete-man-function #'man "A function to that will be called to display a manual page. It will be passed the name of the command to document." @@ -364,11 +361,10 @@ modified to be an empty string, or the desired separation string." ;;; Alternative front-end using the standard completion facilities. -;; The way pcomplete-parse-arguments, pcomplete-stub, and -;; pcomplete-quote-argument work only works because of some deep -;; hypothesis about the way the completion work. Basically, it makes -;; it pretty much impossible to have completion other than -;; prefix-completion. +;; The way pcomplete-parse-arguments and pcomplete-stub work only +;; works because of some deep hypothesis about the way the completion +;; work. Basically, it makes it pretty much impossible to have +;; completion other than prefix-completion. ;; ;; pcomplete--common-suffix and completion-table-subvert try to work around ;; this difficulty with heuristics, but it's really a hack. @@ -841,9 +837,6 @@ this is `comint-dynamic-complete-functions'." (throw 'pcompleted t) pcomplete-args)))))) -(define-obsolete-function-alias - 'pcomplete-quote-argument #'comint-quote-filename "24.3") - ;; file-system completion lists (defsubst pcomplete-dirs-or-entries (&optional regexp predicate) diff --git a/lisp/proced.el b/lisp/proced.el index 52389beff79..c278cce9dc7 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1766,6 +1766,9 @@ The value returned is the value of the last form in BODY." (save-window-excursion ;; Analogous to `dired-pop-to-buffer' ;; Don't split window horizontally. (Bug#1806) + ;; FIXME: `dired-pop-to-buffer' was removed and replaced with + ;; `dired-mark-pop-up'. Should we just use + ;; `pop-to-buffer' here also? (display-buffer (current-buffer) '(display-buffer-in-direction (direction . bottom) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 9327dbf7758..9309a546dbd 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -3148,8 +3148,6 @@ Key bindings: (message "Using CC Mode version %s" c-version) (c-keep-region-active)) -(define-obsolete-variable-alias 'c-prepare-bug-report-hooks - 'c-prepare-bug-report-hook "24.3") (defvar c-prepare-bug-report-hook nil) ;; Dynamic variables used by reporter. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index d09e1f4cdfe..53788949ea4 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -196,9 +196,7 @@ Effective only if `hide-ifdef-expand-reinclusion-guard' is t." "C" #'hif-clear-all-ifdef-defined "C-q" #'hide-ifdef-toggle-read-only "C-w" #'hide-ifdef-toggle-shadowing - "<remap> <read-only-mode>" #'hide-ifdef-toggle-outside-read-only - ;; `toggle-read-only' is obsoleted by `read-only-mode'. - "<remap> <toggle-read-only>" #'hide-ifdef-toggle-outside-read-only) + "<remap> <read-only-mode>" #'hide-ifdef-toggle-outside-read-only) (defcustom hide-ifdef-mode-prefix-key "\C-c@" "Prefix key for all Hide-Ifdef mode commands." diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3247d7ad507..9f9439aac69 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -528,16 +528,6 @@ The type returned can be `comment', `string' or `paren'." (eql (syntax-class (syntax-after (point))) (syntax-class (string-to-syntax ")")))) -(define-obsolete-function-alias - 'python-info-ppss-context #'python-syntax-context "24.3") - -(define-obsolete-function-alias - 'python-info-ppss-context-type #'python-syntax-context-type "24.3") - -(define-obsolete-function-alias - 'python-info-ppss-comment-or-string-p - #'python-syntax-comment-or-string-p "24.3") - (defun python-font-lock-syntactic-face-function (state) "Return syntactic face given STATE." (if (nth 3 state) @@ -953,17 +943,11 @@ It makes underscores and dots word constituent chars.") ;;; Indentation -(define-obsolete-variable-alias - 'python-indent 'python-indent-offset "24.3") - (defcustom python-indent-offset 4 "Default indentation offset for Python." :type 'integer :safe 'integerp) -(define-obsolete-variable-alias - 'python-guess-indent 'python-indent-guess-indent-offset "24.3") - (defcustom python-indent-guess-indent-offset t "Non-nil tells Python mode to guess `python-indent-offset' value." :type 'boolean @@ -3307,17 +3291,11 @@ be asked for their values." "Instead call `python-shell-get-process' and create one if returns nil." "25.1") -(define-obsolete-variable-alias - 'python-buffer 'python-shell-internal-buffer "24.3") - (defvar python-shell-internal-buffer nil "Current internal shell buffer for the current buffer. This is really not necessary at all for the code to work but it's there for compatibility with CEDET.") -(define-obsolete-variable-alias - 'python-preoutput-result 'python-shell-internal-last-output "24.3") - (defvar python-shell-internal-last-output nil "Last output captured by the internal shell. This is really not necessary at all for the code to work but it's @@ -3330,9 +3308,6 @@ there for compatibility with CEDET.") (get-process proc-name) (run-python-internal)))) -(define-obsolete-function-alias - 'python-proc #'python-shell-internal-get-or-create-process "24.3") - (defun python-shell--save-temp-file (string) (let* ((temporary-file-directory (if (file-remote-p default-directory) @@ -3449,12 +3424,6 @@ Returns the output. See `python-shell-send-string-no-output'." (replace-regexp-in-string "_emacs_out +" "" string) (python-shell-internal-get-or-create-process)))) -(define-obsolete-function-alias - 'python-send-receive #'python-shell-internal-send-string "24.3") - -(define-obsolete-function-alias - 'python-send-string #'python-shell-internal-send-string "24.3") - (defun python-shell-buffer-substring (start end &optional nomain no-cookie) "Send buffer substring from START to END formatted for shell. This is a wrapper over `buffer-substring' that takes care of @@ -4620,9 +4589,6 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." ;;; Skeletons -(define-obsolete-variable-alias - 'python-use-skeletons 'python-skeleton-autoinsert "24.3") - (defcustom python-skeleton-autoinsert nil "Non-nil means template skeletons will be automagically inserted. This happens when pressing \"if<SPACE>\", for example, to prompt for diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index be9f325d93d..517fbbd8e7b 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2982,14 +2982,6 @@ option followed by a colon `:' if the option accepts an argument." (match-string 1)))))) -(defun sh-maybe-here-document (arg) - "Insert self. Without prefix, following unquoted `<' inserts here document. -The document is bounded by `sh-here-document-word'." - (declare (obsolete sh-electric-here-document-mode "24.3")) - (interactive "*P") - (self-insert-command (prefix-numeric-value arg)) - (or arg (sh--maybe-here-document))) - (defun sh--maybe-here-document () (when (and (looking-back "[^<]<<[ E-]" (line-beginning-position)) (save-excursion diff --git a/lisp/replace.el b/lisp/replace.el index 06cde771b9e..6393c092886 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -73,14 +73,6 @@ See `query-replace-from-history-variable' and This is a list of cons cells (FROM-STRING . TO-STRING), or nil if there are no default values.") -(defvar query-replace-interactive nil - "Non-nil means `query-replace' uses the last search string. -That becomes the \"string to replace\".") -(make-obsolete-variable 'query-replace-interactive - "use `M-n' to pull the last incremental search string -to the minibuffer that reads the string to replace, or invoke replacements -from Isearch by using a key sequence like `C-s C-s M-%'." "24.3") - (defcustom query-replace-from-to-separator " → " "String that separates FROM and TO in the history of replacement pairs. When nil, the pair will not be added to the history (same behavior @@ -213,96 +205,94 @@ by this function to the end of values available via Prompt with PROMPT. REGEXP-FLAG non-nil means the response should be a regexp. The return value can also be a pair (FROM . TO) indicating that the user wants to replace FROM with TO." - (if query-replace-interactive - (car (if regexp-flag regexp-search-ring search-ring)) - (let* ((history-add-new-input nil) - (separator-string - (when query-replace-from-to-separator - ;; Check if the first non-whitespace char is displayable - (if (char-displayable-p - (string-to-char (string-replace - " " "" query-replace-from-to-separator))) - query-replace-from-to-separator - " -> "))) - (separator - (when separator-string - (propertize separator-string - 'display separator-string - 'face 'minibuffer-prompt - 'separator t))) - (minibuffer-history - (append - (when separator - (mapcar (lambda (from-to) - (concat (query-replace-descr (car from-to)) - separator - (query-replace-descr (cdr from-to)))) - query-replace-defaults)) - (symbol-value query-replace-from-history-variable))) - (minibuffer-allow-text-properties t) ; separator uses text-properties - (default (when (and query-replace-read-from-default (not regexp-flag)) - (funcall query-replace-read-from-default))) - (prompt - (cond ((and query-replace-read-from-regexp-default regexp-flag) prompt) - (default (format-prompt prompt default)) - ((and query-replace-defaults separator) - (format-prompt prompt (car minibuffer-history))) - (query-replace-defaults - (format-prompt - prompt (format "%s -> %s" - (query-replace-descr - (caar query-replace-defaults)) - (query-replace-descr - (cdar query-replace-defaults))))) - (t (format-prompt prompt nil)))) - (from - ;; The save-excursion here is in case the user marks and copies - ;; a region in order to specify the minibuffer input. - ;; That should not clobber the region for the query-replace itself. - (save-excursion - (minibuffer-with-setup-hook - (lambda () - (setq-local text-property-default-nonsticky - (append '((separator . t) (face . t)) - text-property-default-nonsticky))) - (if regexp-flag - (read-regexp - (if query-replace-read-from-regexp-default - (string-remove-suffix ": " prompt) - prompt) - query-replace-read-from-regexp-default - 'minibuffer-history) - (read-from-minibuffer - prompt nil nil nil nil - (if default - (delete-dups - (cons default (query-replace-read-from-suggestions))) - (query-replace-read-from-suggestions)) - t))))) - (to)) - (if (and (zerop (length from)) query-replace-defaults (not default)) - (cons (caar query-replace-defaults) - (query-replace-compile-replacement - (cdar query-replace-defaults) regexp-flag)) - (setq from (or (and (zerop (length from)) default) - (query-replace--split-string from))) - (when (consp from) (setq to (cdr from) from (car from))) - (add-to-history query-replace-from-history-variable from nil t) - ;; Warn if user types \n or \t, but don't reject the input. - (and regexp-flag - (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) - (let ((match (match-string 3 from))) - (cond - ((string= match "\\n") - (message "Note: `\\n' here doesn't match a newline; to do that, type C-q C-j instead")) - ((string= match "\\t") - (message "Note: `\\t' here doesn't match a tab; to do that, just type TAB"))) - (sit-for 2))) - (if (not to) - from - (add-to-history query-replace-to-history-variable to nil t) - (add-to-history 'query-replace-defaults (cons from to) nil t) - (cons from (query-replace-compile-replacement to regexp-flag))))))) + (let* ((history-add-new-input nil) + (separator-string + (when query-replace-from-to-separator + ;; Check if the first non-whitespace char is displayable + (if (char-displayable-p + (string-to-char (string-replace + " " "" query-replace-from-to-separator))) + query-replace-from-to-separator + " -> "))) + (separator + (when separator-string + (propertize separator-string + 'display separator-string + 'face 'minibuffer-prompt + 'separator t))) + (minibuffer-history + (append + (when separator + (mapcar (lambda (from-to) + (concat (query-replace-descr (car from-to)) + separator + (query-replace-descr (cdr from-to)))) + query-replace-defaults)) + (symbol-value query-replace-from-history-variable))) + (minibuffer-allow-text-properties t) ; separator uses text-properties + (default (when (and query-replace-read-from-default (not regexp-flag)) + (funcall query-replace-read-from-default))) + (prompt + (cond ((and query-replace-read-from-regexp-default regexp-flag) prompt) + (default (format-prompt prompt default)) + ((and query-replace-defaults separator) + (format-prompt prompt (car minibuffer-history))) + (query-replace-defaults + (format-prompt + prompt (format "%s -> %s" + (query-replace-descr + (caar query-replace-defaults)) + (query-replace-descr + (cdar query-replace-defaults))))) + (t (format-prompt prompt nil)))) + (from + ;; The save-excursion here is in case the user marks and copies + ;; a region in order to specify the minibuffer input. + ;; That should not clobber the region for the query-replace itself. + (save-excursion + (minibuffer-with-setup-hook + (lambda () + (setq-local text-property-default-nonsticky + (append '((separator . t) (face . t)) + text-property-default-nonsticky))) + (if regexp-flag + (read-regexp + (if query-replace-read-from-regexp-default + (string-remove-suffix ": " prompt) + prompt) + query-replace-read-from-regexp-default + 'minibuffer-history) + (read-from-minibuffer + prompt nil nil nil nil + (if default + (delete-dups + (cons default (query-replace-read-from-suggestions))) + (query-replace-read-from-suggestions)) + t))))) + (to)) + (if (and (zerop (length from)) query-replace-defaults (not default)) + (cons (caar query-replace-defaults) + (query-replace-compile-replacement + (cdar query-replace-defaults) regexp-flag)) + (setq from (or (and (zerop (length from)) default) + (query-replace--split-string from))) + (when (consp from) (setq to (cdr from) from (car from))) + (add-to-history query-replace-from-history-variable from nil t) + ;; Warn if user types \n or \t, but don't reject the input. + (and regexp-flag + (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) + (let ((match (match-string 3 from))) + (cond + ((string= match "\\n") + (message "Note: `\\n' here doesn't match a newline; to do that, type C-q C-j instead")) + ((string= match "\\t") + (message "Note: `\\t' here doesn't match a tab; to do that, just type TAB"))) + (sit-for 2))) + (if (not to) + from + (add-to-history query-replace-to-history-variable to nil t) + (add-to-history 'query-replace-defaults (cons from to) nil t) + (cons from (query-replace-compile-replacement to regexp-flag)))))) (defun query-replace-compile-replacement (to regexp-flag) "Maybe convert a regexp replacement TO to Lisp. diff --git a/lisp/strokes.el b/lisp/strokes.el index d7a95393166..0edb20c2ebb 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -210,9 +210,6 @@ static char * stroke_xpm[] = { :link '(emacs-commentary-link "strokes") :group 'mouse) -(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter - "24.3") - (defcustom strokes-lighter " Strokes" "Mode line identifier for Strokes mode." :type 'string) diff --git a/lisp/subr.el b/lisp/subr.el index c7b86c83e8c..f4b457556d6 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1794,8 +1794,6 @@ be a list of the form returned by `event-start' and `event-end'." ;;;; Obsolescent names for functions. -(make-obsolete 'buffer-has-markers-at nil "24.3") - (make-obsolete 'invocation-directory "use the variable of the same name." "27.1") (make-obsolete 'invocation-name "use the variable of the same name." "27.1") @@ -3758,10 +3756,6 @@ This finishes the change group by reverting all of its changes." ;;;; Display-related functions. -;; For compatibility. -(define-obsolete-function-alias 'redraw-modeline - #'force-mode-line-update "24.3") - (defun momentary-string-display (string pos &optional exit-char message) "Momentarily display STRING in the buffer at POS. Display remains until next event is input. diff --git a/lisp/term.el b/lisp/term.el index 797fb18074f..755c2202703 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -755,25 +755,8 @@ Buffer local variable.") term-color-bright-cyan term-color-bright-white]) -(defcustom term-default-fg-color nil - "If non-nil, default color for foreground in Term mode." - :group 'term - :type '(choice (const nil) (string :tag "color"))) -(make-obsolete-variable 'term-default-fg-color "use the face `term' instead." - "24.3") - -(defcustom term-default-bg-color nil - "If non-nil, default color for foreground in Term mode." - :group 'term - :type '(choice (const nil) (string :tag "color"))) -(make-obsolete-variable 'term-default-bg-color "use the face `term' instead." - "24.3") - (defface term - `((t - :foreground ,term-default-fg-color - :background ,term-default-bg-color - :inherit default)) + `((t :inherit default)) "Default face to use in Term mode." :group 'term) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index e6c0f8c28c0..f624b604aac 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1596,10 +1596,6 @@ Puts point on a blank line between them." ;;;; LaTeX completion. (defvar latex-complete-bibtex-cache nil) - -(define-obsolete-function-alias 'latex-string-prefix-p - #'string-prefix-p "24.3") - (defvar bibtex-reference-key) (declare-function reftex-get-bibfile-list "reftex-cite.el" ()) @@ -2174,8 +2170,6 @@ IN can be either a string (with the same % escapes in it) indicating OUT describes the output file and is either a %-escaped string or nil to indicate that there is no output file.") -(define-obsolete-function-alias 'tex-string-prefix-p #'string-prefix-p "24.3") - (defun tex-guess-main-file (&optional all) "Find a likely `tex-main-file'. Looks for hints in other buffers in the same directory or in diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index 24b064773b8..91f47d0325d 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -96,17 +96,6 @@ If the specified port number is the default, return nil." (or file "/") (if frag (concat "#" frag))))) -(defun url-recreate-url-attributes (urlobj) - "Recreate the attributes of an URL string from the parsed URLOBJ." - (declare (obsolete nil "24.3")) - (when (url-attributes urlobj) - (concat ";" - (mapconcat (lambda (x) - (if (cdr x) - (concat (car x) "=" (cdr x)) - (car x))) - (url-attributes urlobj) ";")))) - ;;;###autoload (defun url-generic-parse-url (url) "Return an URL-struct of the parts of URL. diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index d710578ffff..d617d5aebb2 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -208,8 +208,6 @@ a case simply use the directory containing the changed file." '((t (:inherit font-lock-comment-face))) "Face for highlighting acknowledgments." :version "21.1") -(define-obsolete-face-alias 'change-log-acknowledgement - 'change-log-acknowledgment "24.3") (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index d45e13ea725..bd2e9f19773 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -36,14 +36,6 @@ :group 'ediff :group 'frames) - -;; Determine which window setup function to use based on current window system. -(defun ediff-choose-window-setup-function-automatically () - (declare (obsolete ediff-setup-windows-default "24.3")) - (if (display-graphic-p) - #'ediff-setup-windows-multiframe - #'ediff-setup-windows-plain)) - (defcustom ediff-window-setup-function #'ediff-setup-windows-default "Function called to set up windows. Ediff provides a choice of three functions: diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 89f8d26880b..ddc3ea6e810 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -164,8 +164,6 @@ arguments. If ARGS is not a list, no argument will be passed." (if oneline (line-end-position) (point-max)))) (file-error nil))) -(define-obsolete-function-alias 'cvs-string-prefix-p #'string-prefix-p "24.3") - ;;;; ;;;; file names ;;;; diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index d93be951a3c..6df5f3cf7d7 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3273,8 +3273,6 @@ to provide the `find-revision' operation instead." ;; These things should probably be generally available -(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.3") - (defun vc-file-tree-walk (dirname func &rest args) "Walk recursively through DIRNAME. Invoke FUNC f ARGS on each VC-managed file f underneath it." diff --git a/lisp/window.el b/lisp/window.el index 9ff55dc9807..67a4a4bbf2f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -6622,24 +6622,6 @@ fourth element is BUFFER." window 'quit-restore (list 'tab 'tab (selected-window) buffer))))) -(defcustom display-buffer-function nil - "If non-nil, function to call to handle `display-buffer'. -It will receive two args, the buffer and a flag which if non-nil -means that the currently selected window is not acceptable. It -should choose or create a window, display the specified buffer in -it, and return the window. - -The specified function should call `display-buffer-record-window' -with corresponding arguments to set up the quit-restore parameter -of the window used." - :type '(choice - (const nil) - (function :tag "function")) - :group 'windows) - -(make-obsolete-variable 'display-buffer-function - 'display-buffer-alist "24.3") - (defcustom pop-up-frame-alist nil "Alist of parameters for automatically generated new frames. If non-nil, the value you specify here is used by the default @@ -7745,38 +7727,34 @@ specified by the ACTION argument." ;; Handle the old form of the first argument. (inhibit-same-window (and action (not (listp action))))) (unless (listp action) (setq action nil)) - (if display-buffer-function - ;; If `display-buffer-function' is defined, let it do the job. - (funcall display-buffer-function buffer inhibit-same-window) - ;; Otherwise, use the defined actions. - (let* ((user-action - (display-buffer-assq-regexp - buffer display-buffer-alist action)) - (special-action (display-buffer--special-action buffer)) - ;; Extra actions from the arguments to this function: - (extra-action - (cons nil (append (if inhibit-same-window - '((inhibit-same-window . t))) - (if frame - `((reusable-frames . ,frame)))))) - ;; Construct action function list and action alist. - (actions (list display-buffer-overriding-action - user-action special-action action extra-action - display-buffer-base-action - display-buffer-fallback-action)) - (functions (apply 'append - (mapcar (lambda (x) - (setq x (car x)) - (if (functionp x) (list x) x)) - actions))) - (alist (apply 'append (mapcar 'cdr actions))) - window) - (unless (buffer-live-p buffer) - (error "Invalid buffer")) - (while (and functions (not window)) - (setq window (funcall (car functions) buffer alist) - functions (cdr functions))) - (and (windowp window) window))))) + (let* ((user-action + (display-buffer-assq-regexp + buffer display-buffer-alist action)) + (special-action (display-buffer--special-action buffer)) + ;; Extra actions from the arguments to this function: + (extra-action + (cons nil (append (if inhibit-same-window + '((inhibit-same-window . t))) + (if frame + `((reusable-frames . ,frame)))))) + ;; Construct action function list and action alist. + (actions (list display-buffer-overriding-action + user-action special-action action extra-action + display-buffer-base-action + display-buffer-fallback-action)) + (functions (apply 'append + (mapcar (lambda (x) + (setq x (car x)) + (if (functionp x) (list x) x)) + actions))) + (alist (apply 'append (mapcar 'cdr actions))) + window) + (unless (buffer-live-p buffer) + (error "Invalid buffer")) + (while (and functions (not window)) + (setq window (funcall (car functions) buffer alist) + functions (cdr functions))) + (and (windowp window) window)))) (defun display-buffer-other-frame (buffer) "Display buffer BUFFER preferably in another frame. diff --git a/lisp/winner.el b/lisp/winner.el index 89f337170cc..4290f1fd239 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -318,9 +318,6 @@ You may want to include buffer names such as *Help*, *Apropos*, "Functions to run whenever Winner mode is turned on or off." :type 'hook) -(define-obsolete-variable-alias 'winner-mode-leave-hook - 'winner-mode-off-hook "24.3") - (defcustom winner-mode-off-hook nil "Functions to run whenever Winner mode is turned off." :type 'hook) diff --git a/src/marker.c b/src/marker.c index 9727586f424..0ed1e55ddc9 100644 --- a/src/marker.c +++ b/src/marker.c @@ -759,23 +759,6 @@ If TYPE is nil, it means the marker stays behind when you insert text at it. */ return type; } -DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at, - 1, 1, 0, - doc: /* Return t if there are markers pointing at POSITION in the current buffer. */) - (Lisp_Object position) -{ - register struct Lisp_Marker *tail; - register ptrdiff_t charpos; - - charpos = clip_to_bounds (BEG, XFIXNUM (position), Z); - - for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next) - if (tail->charpos == charpos) - return Qt; - - return Qnil; -} - #ifdef MARKER_DEBUG /* For debugging -- count the markers in buffer BUF. */ @@ -821,5 +804,4 @@ syms_of_marker (void) defsubr (&Scopy_marker); defsubr (&Smarker_insertion_type); defsubr (&Sset_marker_insertion_type); - defsubr (&Sbuffer_has_markers_at); } |