Delete additional items obsolete since 20, 21 and 22

* lisp/font-lock.el (font-lock-reference-face): Delete variable
alias obsolete since 20.3.
* lisp/progmodes/cc-cmds.el (c-toggle-auto-state): Delete alias
obsolete since 22.1.
* lisp/replace.el (query-replace-regexp-eval): Delete function
obsolete since 22.1.
(replace-count, replace-re-search-function): Doc fixes; adjust for
above deleted function.

diff --git a/etc/NEWS b/etc/NEWS
index a6b95cd88f6df6ae38b4967771ff56bf7f515695..ba05b49176175da37d078eda84665ac831ba5be2 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2416,7 +2416,8 @@ but switching to `ash` is generally much preferable.
 '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',
-'gnus-carpal', 'gnus-debug-exclude-variables', 'gnus-debug-files',
+'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',
 'image-extension-data', 'image-library-alist',
@@ -2458,7 +2459,8 @@ but switching to `ash` is generally much preferable.
 
 ---
 ** Some functions and variables obsolete since Emacs 21 or 22 have been removed:
-'find-file-not-found-hooks', 'ls-lisp-dired-ignore-case'.
+'c-toggle-auto-state', 'find-file-not-found-hooks',
+'ls-lisp-dired-ignore-case', 'query-replace-regexp-eval'.
 
 +++
 ** New generic function 'function-documentation'.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 4ae84220a7106565f1dcb10a9f5b6b5efdae3fc4..7eb5a414fe3dc9d7db55e3cff4b4deff671d8368 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -346,9 +346,6 @@ If a number, only buffers greater than this size have fontification messages."
 (defvar font-lock-type-face            'font-lock-type-face
   "Face name to use for type and class names.")
 
-(define-obsolete-variable-alias
-  'font-lock-reference-face 'font-lock-constant-face "20.3")
-
 (defvar font-lock-constant-face                'font-lock-constant-face
   "Face name to use for constant and label names.")
 

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 82268f4943389846c56c806312f0b856e2589666..38e9d6011df5546a73be6e9fa77db190306eb469 100644 (file)
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -328,9 +328,6 @@ after special characters such as brace, comma, semi-colon, and colon."
   (c-update-modeline)
   (c-keep-region-active))
 
-(defalias 'c-toggle-auto-state 'c-toggle-auto-newline)
-(make-obsolete 'c-toggle-auto-state 'c-toggle-auto-newline "22.1")
-
 (defun c-toggle-hungry-state (&optional arg)
   "Toggle hungry-delete-key feature.
 Optional numeric ARG, if supplied, turns on hungry-delete when

diff --git a/lisp/replace.el b/lisp/replace.el
index f8cc784f7c6fa239eee81e1693902020ba1ec752..ab9ac17ed9cd91b02209ae33675b030b9dd70e5b 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -157,7 +157,7 @@ is highlighted lazily using isearch lazy highlighting (see
 
 (defvar replace-count 0
   "Number of replacements done so far.
-See `replace-regexp' and `query-replace-regexp-eval'.")
+See `replace-regexp'.")
 
 (defun query-replace-descr (string)
   (setq string (copy-sequence string))
@@ -563,84 +563,6 @@ REGION-NONCONTIGUOUS-P are passed to `perform-replace' (which see)."
 
 (define-key esc-map [?\C-%] 'query-replace-regexp)
 
-(defun query-replace-regexp-eval (regexp to-expr &optional delimited start end region-noncontiguous-p)
-  "Replace some things after point matching REGEXP with the result of TO-EXPR.
-
-Interactive use of this function is deprecated in favor of the
-`\\,' feature of `query-replace-regexp'.  For non-interactive use, a loop
-using `search-forward-regexp' and `replace-match' is preferred.
-
-As each match is found, the user must type a character saying
-what to do with it.  Type SPC or `y' to replace the match,
-DEL or `n' to skip and go to the next match.  For more directions,
-type \\[help-command] at that time.
-
-TO-EXPR is a Lisp expression evaluated to compute each replacement.  It may
-reference `replace-count' to get the number of replacements already made.
-If the result of TO-EXPR is not a string, it is converted to one using
-`prin1-to-string' with the NOESCAPE argument (which see).
-
-For convenience, when entering TO-EXPR interactively, you can use `\\&'
-to stand for whatever matched the whole of REGEXP, and `\\N' (where
-N is a digit) to stand for whatever matched the Nth `\\(...\\)' (1-based)
-in REGEXP.
-
-Use `\\#&' or `\\#N' if you want a number instead of a string.
-In interactive use, `\\#' in itself stands for `replace-count'.
-
-In Transient Mark mode, if the mark is active, operate on the contents
-of the region.  Otherwise, operate from point to the end of the buffer's
-accessible portion.
-
-Use \\<minibuffer-local-map>\\[next-history-element] \
-to pull the last incremental search regexp to the minibuffer
-that reads REGEXP.
-
-Preserves case in each replacement if `case-replace' and `case-fold-search'
-are non-nil and REGEXP has no uppercase letters.
-
-Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
-ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using `isearch-filter-predicate'.
-
-If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
-to be replaced will match a sequence of whitespace chars defined by the
-regexp in `search-whitespace-regexp'.
-
-This function is not affected by `replace-char-fold'.
-
-Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
-only matches that are surrounded by word boundaries.
-Fourth and fifth arg START and END specify the region to operate on.
-
-Arguments REGEXP, DELIMITED, START, END, and REGION-NONCONTIGUOUS-P
-are passed to `perform-replace' (which see)."
-  (declare (obsolete "use the `\\,' feature of `query-replace-regexp'
-for interactive calls, and `search-forward-regexp'/`replace-match'
-for Lisp calls." "22.1"))
-  (interactive
-   (progn
-     (barf-if-buffer-read-only)
-     (let* ((from
-            ;; Let-bind the history var to disable the "foo -> bar"
-            ;; default.  Maybe we shouldn't disable this default, but
-            ;; for now I'll leave it off.  --Stef
-            (let ((query-replace-defaults nil))
-              (query-replace-read-from "Query replace regexp" t)))
-           (to (list (read-from-minibuffer
-                      (format "Query replace regexp %s with eval: "
-                              (query-replace-descr from))
-                      nil nil t query-replace-to-history-variable from t))))
-       ;; We make TO a list because replace-match-string-symbols requires one,
-       ;; and the user might enter a single token.
-       (replace-match-string-symbols to)
-       (list from (car to) current-prefix-arg
-            (if (use-region-p) (region-beginning))
-            (if (use-region-p) (region-end))
-            (if (use-region-p) (region-noncontiguous-p))))))
-  (perform-replace regexp (cons #'replace-eval-replacement to-expr)
-                  t 'literal delimited nil nil start end nil region-noncontiguous-p))
-
 (defun map-query-replace-regexp (regexp to-strings &optional n start end region-noncontiguous-p)
   "Replace some matches for REGEXP with various strings, in rotation.
 The second argument TO-STRINGS contains the replacement strings, separated
@@ -2719,10 +2641,9 @@ with three arguments, as if it were `search-forward'.")
 
 (defvar replace-re-search-function nil
   "Function to use when searching for regexps to replace.
-It is used by `query-replace-regexp', `replace-regexp',
-`query-replace-regexp-eval', and `map-query-replace-regexp'.
-It is called with three arguments, as if it were
-`re-search-forward'.")
+It is used by `query-replace-regexp', `replace-regexp', and
+`map-query-replace-regexp'.  It is called with three arguments,
+as if it were `re-search-forward'.")
 
 (defvar replace-regexp-function nil
   "Function to convert the FROM string of query-replace commands to a regexp.