emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110190: Use declare forms, where pos


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110190: Use declare forms, where possible, to mark obsolete functions.
Date: Tue, 25 Sep 2012 12:13:02 +0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110190
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-25 12:13:02 +0800
message:
  Use declare forms, where possible, to mark obsolete functions.
  
  * lisp/allout.el (allout-passphrase-hint-string): Likewise.
  (allout-init): Use a declare form to mark obsolete.
  
  * lisp/calendar/calendar.el (calendar-version):
  * lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
  (icalendar-convert-diary-to-ical):
  * lisp/cus-edit.el (custom-mode):
  * lisp/ansi-color.el (ansi-color-unfontify-region):
  * lisp/international/latin1-disp.el (latin1-char-displayable-p):
  * lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
  * lisp/progmodes/which-func.el (which-func-update-1): Use
  define-obsolete-function-alias.
  
  * lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
  this function obsolete.
  
  * lisp/calendar/cal-x.el (calendar-two-frame-setup)
  (calendar-only-one-frame-setup, calendar-one-frame-setup):
  * lisp/calendar/calendar.el (american-calendar, european-calendar)
  (calendar-for-loop):
  * lisp/comint.el (comint-dynamic-simple-complete)
  (comint-dynamic-complete-as-filename, comint-unquote-filename):
  * lisp/desktop.el (desktop-load-default):
  * lisp/dired-x.el (dired-omit-here-always)
  (dired-hack-local-variables, dired-default-directory):
  * lisp/emacs-lisp/derived.el (derived-mode-class):
  * lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
  * lisp/emacs-lock.el (toggle-emacs-lock):
  * lisp/epa.el (epa-display-verify-result):
  * lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
  (epg-passphrase-callback-function):
  * lisp/eshell/esh-util.el (eshell-for):
  * lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
  (eshell-add-to-window-buffer-names):
  * lisp/files.el (locate-file-completion):
  * lisp/imenu.el (imenu-example--create-c-index)
  (imenu-example--create-lisp-index)
  (imenu-example--lisp-extract-index-name)
  (imenu-example--name-and-position):
  * lisp/international/mule-cmds.el (princ-list):
  * lisp/international/mule-diag.el (decode-codepage-char):
  * lisp/international/mule-util.el (detect-coding-with-priority):
  * lisp/iswitchb.el (iswitchb-read-buffer):
  * lisp/mail/mailalias.el (mail-complete):
  * lisp/mail/sendmail.el (mail-sent-via):
  * lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
  (mouse-major-mode-menu):
  * lisp/password-cache.el (password-read-and-add):
  * lisp/pcomplete.el (pcomplete-parse-comint-arguments):
  * lisp/progmodes/sh-script.el (sh-maybe-here-document):
  * lisp/replace.el (query-replace-regexp-eval):
  * lisp/savehist.el (savehist-load):
  * lisp/simple.el (choose-completion-delete-max-match):
  * lisp/term.el (term-dynamic-simple-complete):
  * lisp/vc/ediff-init.el (ediff-check-version):
  * lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
  * lisp/vc/vc.el (vc-diff-switches-list):
  * lisp/view.el (view-return-to-alist-update): Likewise.
  
  * lisp/iswitchb.el (iswitchb-read-buffer): Move code of
  iswitchb-define-mode-map here, and delete that obsolete function.
  
  * lisp/subr.el (eval-next-after-load, makehash, insert-string)
  (assoc-ignore-representation, assoc-ignore-case): Use declare to
  mark obsolete.
  (mode-line-inverse-video): Variable deleted.
  
  * lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
  this applies to functions.
  
  * lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
  
  * lisp/international/mule-util.el (string-to-sequence): Remove.
  
  * lisp/net/newst-backend.el (newsticker-cache-filename):
  * lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
  incorrect obsolescence declaration.
  
  * lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
  font-lock-reference-face.
  
  * lisp/url/url-parse.el (url-recreate-url-attributes):
  * lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
  obsolete.
  
  * src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/allout.el
  lisp/ansi-color.el
  lisp/bookmark.el
  lisp/calendar/cal-x.el
  lisp/calendar/calendar.el
  lisp/calendar/icalendar.el
  lisp/comint.el
  lisp/cus-edit.el
  lisp/cus-start.el
  lisp/desktop.el
  lisp/dired-x.el
  lisp/dired.el
  lisp/emacs-lisp/byte-run.el
  lisp/emacs-lisp/derived.el
  lisp/emacs-lisp/timer.el
  lisp/emacs-lock.el
  lisp/epa.el
  lisp/epg.el
  lisp/erc/ChangeLog
  lisp/erc/erc.el
  lisp/eshell/esh-util.el
  lisp/eshell/eshell.el
  lisp/files.el
  lisp/htmlfontify.el
  lisp/imenu.el
  lisp/international/latin1-disp.el
  lisp/international/mule-cmds.el
  lisp/international/mule-diag.el
  lisp/international/mule-util.el
  lisp/iswitchb.el
  lisp/mail/mailalias.el
  lisp/mail/sendmail.el
  lisp/mouse.el
  lisp/net/newst-backend.el
  lisp/net/newst-treeview.el
  lisp/net/snmp-mode.el
  lisp/password-cache.el
  lisp/pcomplete.el
  lisp/progmodes/cwarn.el
  lisp/progmodes/sh-script.el
  lisp/progmodes/vera-mode.el
  lisp/progmodes/which-func.el
  lisp/replace.el
  lisp/savehist.el
  lisp/simple.el
  lisp/subr.el
  lisp/term.el
  lisp/url/ChangeLog
  lisp/url/url-parse.el
  lisp/url/url-util.el
  lisp/vc/ediff-init.el
  lisp/vc/ediff-wind.el
  lisp/vc/vc.el
  lisp/view.el
  src/ChangeLog
  src/xdisp.c
=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-09-24 12:23:25 +0000
+++ b/etc/NEWS  2012-09-25 04:13:02 +0000
@@ -655,7 +655,7 @@
 **** inactivate-current-input-method-function ->
      deactivate-current-input-method-function
 
-** Some obsolete variables and variable aliases were removed:
+** Some obsolete functions and variables were removed:
 
 *** `facemenu-unlisted-faces'
 *** `rmail-decode-mime-charset'
@@ -663,7 +663,9 @@
 *** `iswitchb-read-buffer'
 *** `sc-version', `sc-submit-bug-report'
 *** `set-char-table-default'
+*** `string-to-sequence' (use `string-to-list' or `string-to-vector').
 *** `compile-internal'
+*** `mode-line-inverse-video'
 *** `cvs-commit-buffer-require-final-newline'
 (use `'log-edit-require-final-newline'instead)
 *** `cvs-changelog-full-paragraphs'

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-25 01:18:50 +0000
+++ b/lisp/ChangeLog    2012-09-25 04:13:02 +0000
@@ -1,3 +1,84 @@
+2012-09-25  Chong Yidong  <address@hidden>
+
+       * bookmark.el (bookmark-jump-noselect): Use a declare form to mark
+       this function obsolete.
+
+       * calendar/cal-x.el (calendar-two-frame-setup)
+       (calendar-only-one-frame-setup, calendar-one-frame-setup):
+       * calendar/calendar.el (american-calendar, european-calendar)
+       (calendar-for-loop):
+       * comint.el (comint-dynamic-simple-complete)
+       (comint-dynamic-complete-as-filename, comint-unquote-filename):
+       * desktop.el (desktop-load-default):
+       * dired-x.el (dired-omit-here-always)
+       (dired-hack-local-variables, dired-default-directory):
+       * emacs-lisp/derived.el (derived-mode-class):
+       * emacs-lisp/timer.el (timer-set-time-with-usecs):
+       * emacs-lock.el (toggle-emacs-lock):
+       * epa.el (epa-display-verify-result):
+       * epg.el (epg-sign-keys, epg-start-sign-keys)
+       (epg-passphrase-callback-function):
+       * eshell/esh-util.el (eshell-for):
+       * eshell/eshell.el (eshell-remove-from-window-buffer-names)
+       (eshell-add-to-window-buffer-names):
+       * files.el (locate-file-completion):
+       * imenu.el (imenu-example--create-c-index)
+       (imenu-example--create-lisp-index)
+       (imenu-example--lisp-extract-index-name)
+       (imenu-example--name-and-position):
+       * international/mule-cmds.el (princ-list):
+       * international/mule-diag.el (decode-codepage-char):
+       * international/mule-util.el (detect-coding-with-priority):
+       * iswitchb.el (iswitchb-read-buffer):
+       * mail/mailalias.el (mail-complete):
+       * mail/sendmail.el (mail-sent-via):
+       * mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
+       (mouse-major-mode-menu):
+       * password-cache.el (password-read-and-add):
+       * pcomplete.el (pcomplete-parse-comint-arguments):
+       * progmodes/sh-script.el (sh-maybe-here-document):
+       * replace.el (query-replace-regexp-eval):
+       * savehist.el (savehist-load):
+       * simple.el (choose-completion-delete-max-match):
+       * term.el (term-dynamic-simple-complete):
+       * vc/ediff-init.el (ediff-check-version):
+       * vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
+       * vc/vc.el (vc-diff-switches-list):
+       * view.el (view-return-to-alist-update): Likewise.
+
+       * subr.el (eval-next-after-load, makehash, insert-string)
+       (assoc-ignore-representation, assoc-ignore-case): Use declare to
+       mark obsolete.
+       (mode-line-inverse-video): Variable deleted.
+
+       * international/mule-util.el (string-to-sequence): Remove.
+
+       * calendar/calendar.el (calendar-version):
+       * calendar/icalendar.el (icalendar-extract-ical-from-buffer)
+       (icalendar-convert-diary-to-ical):
+       * cus-edit.el (custom-mode):
+       * ansi-color.el (ansi-color-unfontify-region):
+       * international/latin1-disp.el (latin1-char-displayable-p):
+       * progmodes/cwarn.el (turn-on-cwarn-mode):
+       * progmodes/which-func.el (which-func-update-1): Use
+       define-obsolete-function-alias.
+
+       * net/newst-backend.el (newsticker-cache-filename):
+       * net/newst-treeview.el (newsticker-groups-filename): Fix
+       incorrect obsolescence declaration.
+
+       * allout.el (allout-passphrase-hint-string): Likewise.
+       (allout-init): Use a declare form to mark obsolete.
+
+       * emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
+       this applies to functions.
+
+       * iswitchb.el (iswitchb-read-buffer): Move code of
+       iswitchb-define-mode-map here, and delete that obsolete function.
+
+       * net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
+       font-lock-reference-face.
+
 2012-09-25  Glenn Morris  <address@hidden>
 
        * buff-menu.el (Buffer-menu-name-width, Buffer-menu-size-width):
@@ -26,10 +107,6 @@
 
 2012-09-24  Chong Yidong  <address@hidden>
 
-       * iswitchb.el (iswitchb-read-buffer): Move
-       iswitchb-define-mode-map code here, and delete that obsolete
-       function.
-
        * mail/supercite.el (sc-version): Remove obsolete function.
        (sc-describe): Don't mark as obsolete, since it is bound.
        (sc-submit-bug-report): Remove.

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2012-08-15 16:29:11 +0000
+++ b/lisp/allout.el    2012-09-25 04:13:02 +0000
@@ -1522,8 +1522,8 @@
 the Emacs buffer state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-verifier-string)
-(make-obsolete 'allout-passphrase-verifier-string
-               'allout-passphrase-verifier-string "23.3")
+(make-obsolete-variable 'allout-passphrase-verifier-string
+                       'allout-passphrase-verifier-string "23.3")
 ;;;###autoload
 (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp)
 ;;;_   = allout-passphrase-hint-string
@@ -1538,8 +1538,8 @@
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-hint-string)
 (setq-default allout-passphrase-hint-string "")
-(make-obsolete 'allout-passphrase-hint-string
-               'allout-passphrase-hint-string "23.3")
+(make-obsolete-variable 'allout-passphrase-hint-string
+                       'allout-passphrase-hint-string "23.3")
 ;;;###autoload
 (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
 ;;;_   = allout-after-save-decrypt
@@ -1688,11 +1688,10 @@
 
 MODE is the activation mode - see `allout-auto-activation' for
 valid values."
-
+  (declare (obsolete allout-auto-activation "23.3"))
   (custom-set-variables (list 'allout-auto-activation (format "%s" mode)))
   (format "%s" mode))
-(make-obsolete 'allout-init
-               "customize 'allout-auto-activation' instead." "23.3")
+
 ;;;_  > allout-setup-menubar ()
 (defun allout-setup-menubar ()
   "Populate the current buffer's menubar with `allout-mode' stuff."

=== modified file 'lisp/ansi-color.el'
--- a/lisp/ansi-color.el        2012-08-15 03:33:55 +0000
+++ b/lisp/ansi-color.el        2012-09-25 04:13:02 +0000
@@ -230,8 +230,8 @@
          (t
           (ansi-color-apply-on-region start-marker end-marker)))))
 
-(defalias 'ansi-color-unfontify-region 'font-lock-default-unfontify-region)
-(make-obsolete 'ansi-color-unfontify-region "not needed any more" "24.1")
+(define-obsolete-function-alias 'ansi-color-unfontify-region
+  'font-lock-default-unfontify-region "24.1")
 
 ;; Working with strings
 (defvar ansi-color-context nil

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2012-09-17 05:41:04 +0000
+++ b/lisp/bookmark.el  2012-09-25 04:13:02 +0000
@@ -1048,12 +1048,11 @@
 
 Note: this function is deprecated and is present for Emacs 22
 compatibility only."
+  (declare (obsolete bookmark-handle-bookmark "23.1"))
   (save-excursion
     (bookmark-handle-bookmark bookmark)
     (cons (current-buffer) (point))))
 
-(make-obsolete 'bookmark-jump-noselect 'bookmark-handle-bookmark "23.1")
-
 (defun bookmark-handle-bookmark (bookmark-name-or-record)
   "Call BOOKMARK-NAME-OR-RECORD's handler or `bookmark-default-handler'
 if it has none.  This changes current buffer and point and returns nil,

=== modified file 'lisp/calendar/cal-x.el'
--- a/lisp/calendar/cal-x.el    2012-01-19 07:21:25 +0000
+++ b/lisp/calendar/cal-x.el    2012-09-25 04:13:02 +0000
@@ -155,29 +155,23 @@
 (defun calendar-one-frame-setup (&optional prompt)
   "Display calendar and diary in a single dedicated frame.
 See `calendar-frame-setup' for more information."
+  (declare (obsolete calendar-frame-setup "23.1"))
   (calendar-frame-setup 'one-frame prompt))
 
-(make-obsolete 'calendar-one-frame-setup 'calendar-frame-setup "23.1")
-
-
 ;;;###cal-autoload
 (defun calendar-only-one-frame-setup (&optional prompt)
   "Display calendar in a dedicated frame.
 See `calendar-frame-setup' for more information."
+  (declare (obsolete calendar-frame-setup "23.1"))
   (calendar-frame-setup 'calendar-only prompt))
 
-(make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1")
-
-
 ;;;###cal-autoload
 (defun calendar-two-frame-setup (&optional prompt)
   "Display calendar and diary in separate, dedicated frames.
 See `calendar-frame-setup' for more information."
+  (declare (obsolete calendar-frame-setup "23.1"))
   (calendar-frame-setup 'two-frames prompt))
 
-(make-obsolete 'calendar-two-frame-setup 'calendar-frame-setup "23.1")
-
-
 ;; Undocumented and probably useless.
 (defvar cal-x-load-hook nil
   "Hook run on loading of the `cal-x' package.")

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2012-09-24 11:39:33 +0000
+++ b/lisp/calendar/calendar.el 2012-09-25 04:13:02 +0000
@@ -1001,18 +1001,16 @@
 
 (defun european-calendar ()
   "Set the interpretation and display of dates to the European style."
+  (declare (obsolete calendar-set-date-style "23.1"))
   (interactive)
   (calendar-set-date-style 'european))
 
-(make-obsolete 'european-calendar 'calendar-set-date-style "23.1")
-
 (defun american-calendar ()
   "Set the interpretation and display of dates to the American style."
+  (declare (obsolete calendar-set-date-style "23.1"))
   (interactive)
   (calendar-set-date-style 'american))
 
-(make-obsolete 'american-calendar 'calendar-set-date-style "23.1")
-
 (define-obsolete-variable-alias 'holidays-in-diary-buffer
   'diary-show-holidays-flag "23.1")
 
@@ -1148,14 +1146,13 @@
   "Execute a for loop.
 Evaluate BODY with VAR bound to successive integers from INIT to FINAL,
 inclusive.  The standard macro `dotimes' is preferable in most cases."
-  (declare (debug (symbolp "from" form "to" form "do" body))
+  (declare (obsolete "use `dotimes' or `while' instead." "23.1")
+          (debug (symbolp "from" form "to" form "do" body))
            (indent defun))
   `(let ((,var (1- ,init)))
     (while (>= ,final (setq ,var (1+ ,var)))
       ,@body)))
 
-(make-obsolete 'calendar-for-loop "use `dotimes' or `while' instead." "23.1")
-
 (defmacro calendar-sum (index initial condition expression)
   "For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION."
   (declare (debug (symbolp form form form)))
@@ -2655,13 +2652,7 @@
                 "---")
             (calendar-string-spread (list str) ?- width)))))
 
-(defun calendar-version ()
-  "Display the Calendar version."
-  (interactive)
-  (message "GNU Emacs %s" emacs-version))
-
-(make-obsolete 'calendar-version 'emacs-version "23.1")
-
+(define-obsolete-function-alias 'calendar-version 'emacs-version "23.1")
 
 (run-hooks 'calendar-load-hook)
 

=== modified file 'lisp/calendar/icalendar.el'
--- a/lisp/calendar/icalendar.el        2012-06-08 17:34:09 +0000
+++ b/lisp/calendar/icalendar.el        2012-09-25 04:13:02 +0000
@@ -931,8 +931,8 @@
     (set-buffer (find-file diary-filename))
     (icalendar-export-region (point-min) (point-max) ical-filename)))
 
-(defalias 'icalendar-convert-diary-to-ical 'icalendar-export-file)
-(make-obsolete 'icalendar-convert-diary-to-ical 'icalendar-export-file "22.1")
+(define-obsolete-function-alias 'icalendar-convert-diary-to-ical
+  'icalendar-export-file "22.1")
 
 (defvar icalendar--uid-count 0
   "Auxiliary counter for creating unique ids.")
@@ -1881,8 +1881,8 @@
       ;; return nil, i.e. import did not work
       nil)))
 
-(defalias 'icalendar-extract-ical-from-buffer 'icalendar-import-buffer)
-(make-obsolete 'icalendar-extract-ical-from-buffer 'icalendar-import-buffer 
"22.1")
+(define-obsolete-function-alias 'icalendar-extract-ical-from-buffer
+  'icalendar-import-buffer "22.1")
 
 (defun icalendar--format-ical-event (event)
   "Create a string representation of an iCalendar EVENT."

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2012-09-17 14:45:51 +0000
+++ b/lisp/comint.el    2012-09-25 04:13:02 +0000
@@ -3069,11 +3069,11 @@
 
 (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))))
-(make-obsolete 'comint-unquote-filename nil "24.3")
 
 (defun comint--requote-argument (upos qstr)
   ;; See `completion-table-with-quoting'.
@@ -3170,10 +3170,9 @@
 (defun comint-dynamic-complete-as-filename ()
   "Dynamically complete at point as a filename.
 See `comint-dynamic-complete-filename'.  Returns t if successful."
+  (declare (obsolete comint-filename-completion "24.1"))
   (let ((data (comint--complete-file-name-data)))
     (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data))))
-(make-obsolete 'comint-dynamic-complete-as-filename
-               'comint-filename-completion "24.1")
 
 (defun comint-replace-by-expanded-filename ()
   "Dynamically expand and complete the filename at point.
@@ -3204,6 +3203,7 @@
 Return `listed' if a completion listing was shown.
 
 See also `comint-dynamic-complete-filename'."
+  (declare (obsolete completion-in-region "24.1"))
   (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt 
cygwin)))
         (minibuffer-p (window-minibuffer-p (selected-window)))
         (suffix (cond ((not comint-completion-addsuffix) "")
@@ -3246,8 +3246,6 @@
                    (unless minibuffer-p
                      (message "Partially completed"))
                    'partial)))))))
-(make-obsolete 'comint-dynamic-simple-complete 'completion-in-region "24.1")
-
 
 (defun comint-dynamic-list-filename-completions ()
   "Display a list of possible completions for the filename at point."

=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el  2012-09-18 05:14:42 +0000
+++ b/lisp/cus-edit.el  2012-09-25 04:13:02 +0000
@@ -2228,9 +2228,9 @@
             (setq widget nil)))))
   (widget-setup))
 
-(make-obsolete 'custom-show "this widget type is no longer supported." "24.1")
 (defun custom-show (widget value)
   "Non-nil if WIDGET should be shown with VALUE by default."
+  (declare (obsolete "this widget type is no longer supported." "24.1"))
   (let ((show (widget-get widget :custom-show)))
     (if (functionp show)
        (funcall show widget value)
@@ -4823,12 +4823,7 @@
 
 (put 'Custom-mode 'mode-class 'special)
 
-;; backward-compatibility
-(defun custom-mode ()
-  "Non-interactive variant of `Custom-mode'."
-  (Custom-mode))
-(make-obsolete 'custom-mode 'Custom-mode "23.1")
-(put 'custom-mode 'mode-class 'special)
+(define-obsolete-function-alias 'custom-mode 'Custom-mode "23.1")
 
 (add-to-list 'debug-ignored-errors "^Invalid face:? ")
 

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-09-22 12:56:08 +0000
+++ b/lisp/cus-start.el 2012-09-25 04:13:02 +0000
@@ -443,7 +443,6 @@
             (hscroll-step windows number "22.1")
             (truncate-partial-width-windows display boolean "23.1")
             (make-cursor-line-fully-visible windows boolean)
-            (mode-line-inverse-video mode-line boolean)
             (mode-line-in-non-selected-windows mode-line boolean "22.1")
             (line-number-display-limit display
                                        (choice integer

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2012-09-17 05:41:04 +0000
+++ b/lisp/desktop.el   2012-09-25 04:13:02 +0000
@@ -1045,11 +1045,10 @@
 (defun desktop-load-default ()
   "Load the `default' start-up library manually.
 Also inhibit further loading of it."
+  (declare (obsolete desktop-save-mode "22.1"))
   (unless inhibit-default-init         ; safety check
     (load "default" t t)
     (setq inhibit-default-init t)))
-(make-obsolete 'desktop-load-default
-               'desktop-save-mode "22.1")
 
 ;; ----------------------------------------------------------------------------
 ;;;###autoload

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2012-06-02 10:56:09 +0000
+++ b/lisp/dired-x.el   2012-09-25 04:13:02 +0000
@@ -723,15 +723,13 @@
 (defun dired-default-directory ()
   "Return the `dired-default-directory-alist' entry for the current major-mode.
 If none, return `default-directory'."
+  ;; It looks like this was intended to be something of a "general"
+  ;; feature, but it only ever seems to have been used in
+  ;; dired-smart-shell-command, and doesn't seem worth keeping around.
+  (declare (obsolete nil "24.1"))
   (or (eval (cdr (assq major-mode dired-default-directory-alist)))
       default-directory))
 
-;; It looks like this was intended to be something of a "general" feature,
-;; but it only ever seems to have been used in dired-smart-shell-command,
-;; and does not seem worth keeping around (?).
-(make-obsolete 'dired-default-directory
-               "this feature is due to be removed." "24.1")
-
 (defun dired-smart-shell-command (command &optional output-buffer error-buffer)
   "Like function `shell-command', but in the current Virtual Dired directory."
   (interactive
@@ -782,6 +780,7 @@
 
 (defun dired-hack-local-variables ()
   "Evaluate local variables in `dired-local-variables-file' for dired buffer."
+  (declare (obsolete hack-dir-local-variables-non-file-buffer "24.1"))
   (and (stringp dired-local-variables-file)
        (file-exists-p dired-local-variables-file)
        (let ((opoint (point-max))
@@ -803,14 +802,12 @@
          ;; Make sure that the mode line shows the proper information.
          (dired-sort-set-mode-line))))
 
-(make-obsolete 'dired-hack-local-variables
-               'hack-dir-local-variables-non-file-buffer "24.1")
-
 ;; Does not seem worth a dedicated command.
 ;; See the more general features in files-x.el.
 (defun dired-omit-here-always ()
   "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'.
 If in a Dired buffer, reverts it."
+  (declare (obsolete add-dir-local-variable "24.1"))
   (interactive)
   (if (file-exists-p dired-local-variables-file)
       (error "Old-style dired-local-variables-file `./%s' found;
@@ -830,8 +827,6 @@
       (dired-extra-startup)
       (dired-revert))))
 
-(make-obsolete 'dired-omit-here-always 'add-dir-local-variable "24.1")
-
 
 ;;; GUESS SHELL COMMAND.
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2012-09-23 10:21:34 +0000
+++ b/lisp/dired.el     2012-09-25 04:13:02 +0000
@@ -4268,7 +4268,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "d2461aa6efb8c1d7de8f245728ab448e")
+;;;;;;  "dired-x" "dired-x.el" "a4e6844421c2c5e6fde90e959fbcc26f")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\

=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el       2012-09-17 05:41:04 +0000
+++ b/lisp/emacs-lisp/byte-run.el       2012-09-25 04:13:02 +0000
@@ -253,7 +253,9 @@
            advertised-signature-table))
 
 (defun make-obsolete (obsolete-name current-name &optional when)
-  "Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
+  "Make the byte-compiler warn that function OBSOLETE-NAME is obsolete.
+OBSOLETE-NAME should be a function name or macro name (a symbol).
+
 The warning will say that CURRENT-NAME should be used instead.
 If CURRENT-NAME is a string, that is the `use instead' message
 \(it should end with a period, and not start with a capital).

=== modified file 'lisp/emacs-lisp/derived.el'
--- a/lisp/emacs-lisp/derived.el        2012-06-10 13:28:26 +0000
+++ b/lisp/emacs-lisp/derived.el        2012-09-25 04:13:02 +0000
@@ -276,10 +276,10 @@
 Use the `derived-mode-parent' property of the symbol to trace backwards.
 Since major-modes might all derive from `fundamental-mode', this function
 is not very useful."
+  (declare (obsolete derived-mode-p "22.1"))
   (while (get mode 'derived-mode-parent)
     (setq mode (get mode 'derived-mode-parent)))
   mode)
-(make-obsolete 'derived-mode-class 'derived-mode-p "22.1")
 
 
 ;;; PRIVATE

=== modified file 'lisp/emacs-lisp/timer.el'
--- a/lisp/emacs-lisp/timer.el  2012-09-22 13:16:03 +0000
+++ b/lisp/emacs-lisp/timer.el  2012-09-25 04:13:02 +0000
@@ -146,14 +146,13 @@
 The microsecond count from TIME is ignored, and USECS is used instead.
 If optional fourth argument DELTA is a positive number, make the timer
 fire repeatedly that many seconds apart."
+  (declare (obsolete "use `timer-set-time' and `timer-inc-time' instead."
+                    "22.1"))
   (setf (timer--time timer) time)
   (setf (timer--usecs timer) usecs)
   (setf (timer--psecs timer) 0)
   (setf (timer--repeat-delay timer) (and (numberp delta) (> delta 0) delta))
   timer)
-(make-obsolete 'timer-set-time-with-usecs
-               "use `timer-set-time' and `timer-inc-time' instead."
-               "22.1")
 
 (defun timer-set-function (timer function &optional args)
   "Make TIMER call FUNCTION with optional ARGS when triggering."

=== modified file 'lisp/emacs-lock.el'
--- a/lisp/emacs-lock.el        2012-08-15 16:29:11 +0000
+++ b/lisp/emacs-lock.el        2012-09-25 04:13:02 +0000
@@ -249,9 +249,9 @@
 
 (defun toggle-emacs-lock ()
   "Toggle `emacs-lock-from-exiting' for the current buffer."
+  (declare (obsolete emacs-lock-mode "24.1"))
   (interactive)
   (call-interactively 'emacs-lock-mode))
-(make-obsolete 'toggle-emacs-lock 'emacs-lock-mode "24.1")
 
 (provide 'emacs-lock)
 

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2012-06-08 16:39:49 +0000
+++ b/lisp/epa.el       2012-09-25 04:13:02 +0000
@@ -585,8 +585,8 @@
     (message "%s" info)))
 
 (defun epa-display-verify-result (verify-result)
+  (declare (obsolete epa-display-info "23.1"))
   (epa-display-info (epg-verify-result-to-string verify-result)))
-(make-obsolete 'epa-display-verify-result 'epa-display-info "23.1")
 
 (defun epa-passphrase-callback-function (context key-id handback)
   (if (eq key-id 'SYM)

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2012-01-19 07:21:25 +0000
+++ b/lisp/epg.el       2012-09-25 04:13:02 +0000
@@ -1779,6 +1779,7 @@
     (epg-context-set-result-for context 'import-status nil)))
 
 (defun epg-passphrase-callback-function (context key-id _handback)
+  (declare (obsolete epa-passphrase-callback-function "23.1"))
   (if (eq key-id 'SYM)
       (read-passwd "Passphrase for symmetric encryption: "
                   (eq (epg-context-operation context) 'encrypt))
@@ -1790,9 +1791,6 @@
             (format "Passphrase for %s %s: " key-id (cdr entry))
           (format "Passphrase for %s: " key-id)))))))
 
-(make-obsolete 'epg-passphrase-callback-function
-              'epa-passphrase-callback-function "23.1")
-
 (defun epg--list-keys-1 (context name mode)
   (let ((args (append (if epg-gpg-home-directory
                          (list "--homedir" epg-gpg-home-directory))
@@ -2562,6 +2560,7 @@
 `epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-sign-keys' instead."
+  (declare (obsolete nil "23.1"))
   (epg-context-set-operation context 'sign-keys)
   (epg-context-set-result context nil)
   (epg--start context (cons (if local
@@ -2572,10 +2571,10 @@
                              (epg-sub-key-id
                               (car (epg-key-sub-key-list key))))
                            keys))))
-(make-obsolete 'epg-start-sign-keys "do not use." "23.1")
 
 (defun epg-sign-keys (context keys &optional local)
   "Sign KEYS from the key ring."
+  (declare (obsolete nil "23.1"))
   (unwind-protect
       (progn
        (epg-start-sign-keys context keys local)
@@ -2586,7 +2585,6 @@
                      (list "Sign keys failed"
                            (epg-errors-to-string errors))))))
     (epg-reset context)))
-(make-obsolete 'epg-sign-keys "do not use." "23.1")
 
 (defun epg-start-generate-key (context parameters)
   "Initiate a key generation.

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-09-17 05:41:04 +0000
+++ b/lisp/erc/ChangeLog        2012-09-25 04:13:02 +0000
@@ -1,3 +1,7 @@
+2012-09-25  Chong Yidong  <address@hidden>
+
+       * erc.el (erc-send-command): Use define-obsolete-function-alias.
+
 2012-09-17  Chong Yidong  <address@hidden>
 
        * erc-page.el (erc-page-function): 

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2012-08-20 16:08:51 +0000
+++ b/lisp/erc/erc.el   2012-09-25 04:13:02 +0000
@@ -139,8 +139,8 @@
   (message (concat "ERC: The function `defvaralias' is not bound.  See the "
                   "NEWS file for variable name changes since ERC 5.0.4.")))
 
-(defalias 'erc-send-command 'erc-server-send)
-(erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
+(define-obsolete-function-alias 'erc-send-command
+  'erc-server-send "ERC 5.1")
 
 ;; tunable connection and authentication parameters
 

=== modified file 'lisp/eshell/esh-util.el'
--- a/lisp/eshell/esh-util.el   2012-09-17 05:41:04 +0000
+++ b/lisp/eshell/esh-util.el   2012-09-25 04:13:02 +0000
@@ -275,6 +275,7 @@
 
 (defmacro eshell-for (for-var for-list &rest forms)
   "Iterate through a list."
+  (declare (obsolete dolist "24.1"))
   (declare (indent 2))
   `(let ((list-iter ,for-list))
      (while list-iter
@@ -282,9 +283,6 @@
         ,@forms)
        (setq list-iter (cdr list-iter)))))
 
-
-(make-obsolete 'eshell-for 'dolist "24.1")
-
 (defun eshell-flatten-list (args)
   "Flatten any lists within ARGS, so that there are no sublists."
   (let ((new-list (list t)))

=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el     2012-08-15 16:29:11 +0000
+++ b/lisp/eshell/eshell.el     2012-09-25 04:13:02 +0000
@@ -243,16 +243,14 @@
 
 (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))
-(make-obsolete 'eshell-add-to-window-buffer-names
-              "no longer needed." "24.3")
 
 (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)))
-(make-obsolete 'eshell-remove-from-window-buffer-names
-              "no longer needed." "24.3")
 
 (defcustom eshell-load-hook nil
   "A hook run once Eshell has been loaded."

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-09-22 15:44:43 +0000
+++ b/lisp/files.el     2012-09-25 04:13:02 +0000
@@ -821,10 +821,10 @@
 (defun locate-file-completion (string path-and-suffixes action)
   "Do completion for file names passed to `locate-file'.
 PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
+  (declare (obsolete locate-file-completion-table "23.1"))
   (locate-file-completion-table (car path-and-suffixes)
                                 (cdr path-and-suffixes)
                                 string nil action))
-(make-obsolete 'locate-file-completion 'locate-file-completion-table "23.1")
 
 (defvar locate-dominating-stop-dir-regexp
   (purecopy 
"\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'")

=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el       2012-03-17 14:03:54 +0000
+++ b/lisp/htmlfontify.el       2012-09-25 04:13:02 +0000
@@ -1052,8 +1052,6 @@
     (hfy-face-attr-for-class fn hfy-display-class))
    ((and (symbolp fn)
          (facep (symbol-value fn)))
-    ;; Obsolete faces like `font-lock-reference-face' are defined as
-    ;; aliases for another face.
     (hfy-face-attr-for-class (symbol-value fn) hfy-display-class))
    (t nil)))
 

=== modified file 'lisp/imenu.el'
--- a/lisp/imenu.el     2012-08-05 14:14:54 +0000
+++ b/lisp/imenu.el     2012-09-25 04:13:02 +0000
@@ -326,6 +326,7 @@
 (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
@@ -333,8 +334,6 @@
          (end (progn (forward-sexp) (point))))
       (cons (buffer-substring beg end)
            beg))))
-(make-obsolete 'imenu-example--name-and-position
-              "use your own function instead." "23.2")
 
 ;;;
 ;;; Lisp
@@ -343,6 +342,7 @@
 (defun imenu-example--lisp-extract-index-name ()
   ;; Example of a candidate for `imenu-extract-index-name-function'.
   ;; This will generate a flat index of definitions in a lisp file.
+  (declare (obsolete nil "23.2"))
   (save-match-data
     (and (looking-at "(def")
         (condition-case nil
@@ -353,11 +353,11 @@
                     (end (progn (forward-sexp -1) (point))))
                 (buffer-substring beg end)))
           (error nil)))))
-(make-obsolete 'imenu-example--lisp-extract-index-name "your own" "23.2")
 
 (defun imenu-example--create-lisp-index ()
   ;; Example of a candidate for `imenu-create-index-function'.
   ;; It will generate a nested index of definitions.
+  (declare (obsolete nil "23.2"))
   (let ((index-alist '())
        (index-var-alist '())
        (index-type-alist '())
@@ -401,7 +401,6 @@
         (push (cons "Syntax-unknown" index-unknown-alist)
               index-alist))
     index-alist))
-(make-obsolete 'imenu-example--create-lisp-index "your own" "23.2")
 
 ;; Regular expression to find C functions
 (defvar imenu-example--function-name-regexp-c
@@ -414,6 +413,7 @@
    ))
 
 (defun imenu-example--create-c-index (&optional regexp)
+  (declare (obsolete nil "23.2"))
   (let ((index-alist '())
        char)
     (goto-char (point-min))
@@ -430,7 +430,6 @@
        (if (not (eq char ?\;))
            (push (imenu-example--name-and-position) index-alist))))
     (nreverse index-alist)))
-(make-obsolete 'imenu-example--create-c-index "your own" "23.2")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;

=== modified file 'lisp/international/latin1-disp.el'
--- a/lisp/international/latin1-disp.el 2012-01-19 07:21:25 +0000
+++ b/lisp/international/latin1-disp.el 2012-09-25 04:13:02 +0000
@@ -202,8 +202,8 @@
     (and char (char-displayable-p char))))
 
 ;; Backwards compatibility.
-(defalias 'latin1-char-displayable-p 'char-displayable-p)
-(make-obsolete 'latin1-char-displayable-p 'char-displayable-p "22.1")
+(define-obsolete-function-alias 'latin1-char-displayable-p
+  'char-displayable-p "22.1")
 
 (defun latin1-display-setup (set &optional force)
   "Set up Latin-1 display for characters in the given SET.

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2012-08-15 16:29:11 +0000
+++ b/lisp/international/mule-cmds.el   2012-09-25 04:13:02 +0000
@@ -2058,9 +2058,9 @@
 
 (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"))
-(make-obsolete 'princ-list "use mapc and princ instead" "23.3")
 
 (put 'describe-specified-language-support 'apropos-inhibit t)
 

=== modified file 'lisp/international/mule-diag.el'
--- a/lisp/international/mule-diag.el   2012-01-19 07:21:25 +0000
+++ b/lisp/international/mule-diag.el   2012-09-25 04:13:02 +0000
@@ -208,8 +208,8 @@
   "Decode a character that has code CODE in CODEPAGE.
 Return a decoded character string.  Each CODEPAGE corresponds to a
 coding system cpCODEPAGE."
+  (declare (obsolete decode-char "23.1"))
   (decode-char (intern (format "cp%d" codepage)) code))
-(make-obsolete 'decode-codepage-char 'decode-char "23.1")
 
 ;; A variable to hold charset input history.
 (defvar charset-history nil)

=== modified file 'lisp/international/mule-util.el'
--- a/lisp/international/mule-util.el   2012-01-19 07:21:25 +0000
+++ b/lisp/international/mule-util.el   2012-09-25 04:13:02 +0000
@@ -34,39 +34,6 @@
 ;;; characters.
 
 ;;;###autoload
-(defun string-to-sequence (string type)
-  "Convert STRING to a sequence of TYPE which contains characters in STRING.
-TYPE should be `list' or `vector'."
-;;;  (let ((len (length string))
-;;;       (i 0)
-;;;       val)
-    (cond ((eq type 'list)
-          ;; Applicable post-Emacs 20.2 and asymptotically ~10 times
-          ;; faster than the code below:
-          (append string nil))
-;;;       (setq val (make-list len 0))
-;;;       (let ((l val))
-;;;         (while (< i len)
-;;;           (setcar l (aref string i))
-;;;           (setq l (cdr l) i (1+ i))))))
-         ((eq type 'vector)
-          ;; As above.
-          (vconcat string))
-;;;       (setq val (make-vector len 0))
-;;;       (while (< i len)
-;;;         (aset val i (aref string i))
-;;;         (setq i (1+ i))))
-         (t
-          (error "Invalid type: %s" type)))
-;;;    val)
-)
-
-;;;###autoload
-(make-obsolete 'string-to-sequence
-              "use `string-to-list' or `string-to-vector'."
-              "22.1")
-
-;;;###autoload
 (defsubst string-to-list (string)
   "Return a list of characters in STRING."
   (append string nil))
@@ -330,10 +297,9 @@
   "Detect a coding system of the text between FROM and TO with PRIORITY-LIST.
 PRIORITY-LIST is an alist of coding categories vs the corresponding
 coding systems ordered by priority."
+  (declare (obsolete with-coding-priority "23.1"))
   `(with-coding-priority (mapcar #'cdr ,priority-list)
      (detect-coding-region ,from ,to)))
-(make-obsolete 'detect-coding-with-priority
-              "use `with-coding-priority' and `detect-coding-region'." "23.1")
 
 ;;;###autoload
 (defun detect-coding-with-language-environment (from to lang-env)

=== modified file 'lisp/iswitchb.el'
--- a/lisp/iswitchb.el  2012-07-25 05:48:19 +0000
+++ b/lisp/iswitchb.el  2012-09-25 04:13:02 +0000
@@ -527,33 +527,6 @@
 
 ;;; FUNCTIONS
 
-;;; ISWITCHB KEYMAP
-(defun iswitchb-define-mode-map ()
-  "Set up the keymap for `iswitchb-buffer'."
-  (interactive)
-  (let (map)
-    ;; generated every time so that it can inherit new functions.
-    ;;(or iswitchb-mode-map
-
-    (setq map (copy-keymap minibuffer-local-map))
-    (define-key map "?" 'iswitchb-completion-help)
-    (define-key map "\C-s" 'iswitchb-next-match)
-    (define-key map "\C-r" 'iswitchb-prev-match)
-    (define-key map "\t" 'iswitchb-complete)
-    (define-key map "\C-j" 'iswitchb-select-buffer-text)
-    (define-key map "\C-t" 'iswitchb-toggle-regexp)
-    (define-key map "\C-x\C-f" 'iswitchb-find-file)
-    (define-key map "\C-n" 'iswitchb-toggle-ignore)
-    (define-key map "\C-c" 'iswitchb-toggle-case)
-    (define-key map "\C-k" 'iswitchb-kill-buffer)
-    (define-key map "\C-m" 'iswitchb-exit-minibuffer)
-    (setq iswitchb-mode-map map)
-    (run-hooks 'iswitchb-define-mode-map-hook)))
-
-(make-obsolete 'iswitchb-define-mode-map
-              "use M-x iswitchb-mode or customize the variable 
`iswitchb-mode'."
-              "21.1")
-
 ;;; MAIN FUNCTION
 (defun iswitchb ()
   "Switch to buffer matching a substring.
@@ -619,14 +592,25 @@
 string.
 If MATCHES-SET is non-nil, the buflist is not updated before
 the selection process begins.  Used by isearchb.el."
-  (let
-      (
-       buf-sel
-       iswitchb-final-text
-       (icomplete-mode nil) ;; prevent icomplete starting up
-       )
+  ;; The map is generated every time so that it can inherit new
+  ;; functions.
+  (let ((map (copy-keymap minibuffer-local-map))
+       buf-sel iswitchb-final-text map
+       icomplete-mode)  ; prevent icomplete starting up
+    (define-key map "?" 'iswitchb-completion-help)
+    (define-key map "\C-s" 'iswitchb-next-match)
+    (define-key map "\C-r" 'iswitchb-prev-match)
+    (define-key map "\t" 'iswitchb-complete)
+    (define-key map "\C-j" 'iswitchb-select-buffer-text)
+    (define-key map "\C-t" 'iswitchb-toggle-regexp)
+    (define-key map "\C-x\C-f" 'iswitchb-find-file)
+    (define-key map "\C-n" 'iswitchb-toggle-ignore)
+    (define-key map "\C-c" 'iswitchb-toggle-case)
+    (define-key map "\C-k" 'iswitchb-kill-buffer)
+    (define-key map "\C-m" 'iswitchb-exit-minibuffer)
+    (setq iswitchb-mode-map map)
+    (run-hooks 'iswitchb-define-mode-map-hook)
 
-    (iswitchb-define-mode-map)
     (setq iswitchb-exit nil)
     (setq iswitchb-default
          (if (bufferp default)

=== modified file 'lisp/mail/mailalias.el'
--- a/lisp/mail/mailalias.el    2012-01-19 07:21:25 +0000
+++ b/lisp/mail/mailalias.el    2012-09-25 04:13:02 +0000
@@ -427,6 +427,7 @@
   "Perform completion on header field or word preceding point.
 Completable headers are according to `mail-complete-alist'.  If none matches
 current header, calls `mail-complete-function' and passes prefix ARG if any."
+  (declare (obsolete mail-completion-at-point-function "24.1"))
   (interactive "P")
   ;; Read the defaults first, if we have not done so.
   (sendmail-sync-aliases)
@@ -439,7 +440,6 @@
     (if data
         (apply #'completion-in-region data)
       (funcall mail-complete-function arg))))
-(make-obsolete 'mail-complete 'mail-completion-at-point-function "24.1")
 
 (defun mail-completion-expand (table)
   "Build new completion table that expands aliases.

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2012-07-29 07:16:45 +0000
+++ b/lisp/mail/sendmail.el     2012-09-25 04:13:02 +0000
@@ -1414,6 +1414,7 @@
 
 (defun mail-sent-via ()
   "Make a Sent-via header line from each To or CC header line."
+  (declare (obsolete "nobody can remember what it is for." "24.1"))
   (interactive)
   (save-excursion
     ;; put a marker at the end of the header
@@ -1433,9 +1434,6 @@
                                   (point)))))
          ;; Insert a copy, with altered header field name.
          (insert-before-markers "Sent-via:" to-line))))))
-
-(make-obsolete 'mail-sent-via "nobody can remember what it is for." "24.1")
-
 
 (defun mail-to ()
   "Move point to end of To field, creating it if necessary."

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2012-08-17 09:10:31 +0000
+++ b/lisp/mouse.el     2012-09-25 04:13:02 +0000
@@ -284,23 +284,24 @@
 (defun mouse-major-mode-menu (event &optional prefix)
   "Pop up a mode-specific menu of mouse commands.
 Default to the Edit menu if the major mode doesn't define a menu."
+  (declare (obsolete mouse-menu-major-mode-map "23.1"))
   (interactive "@e\nP")
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
   (popup-menu (mouse-menu-major-mode-map) event prefix))
-(make-obsolete 'mouse-major-mode-menu 'mouse-menu-major-mode-map "23.1")
 
 (defun mouse-popup-menubar (event prefix)
   "Pop up a menu equivalent to the menu bar for keyboard EVENT with PREFIX.
 The contents are the items that would be in the menu bar whether or
 not it is actually displayed."
+  (declare (obsolete mouse-menu-bar-map "23.1"))
   (interactive "@e \nP")
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
   (popup-menu (mouse-menu-bar-map) (unless (integerp event) event) prefix))
-(make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map "23.1")
 
 (defun mouse-popup-menubar-stuff (event prefix)
   "Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'.
 Use the former if the menu bar is showing, otherwise the latter."
+  (declare (obsolete nil "23.1"))
   (interactive "@e\nP")
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
   (popup-menu
@@ -308,7 +309,6 @@
        (mouse-menu-bar-map)
      (mouse-menu-major-mode-map))
    event prefix))
-(make-obsolete 'mouse-popup-menubar-stuff nil "23.1")
 
 ;; Commands that operate on windows.
 

=== modified file 'lisp/net/newst-backend.el'
--- a/lisp/net/newst-backend.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/newst-backend.el 2012-09-25 04:13:02 +0000
@@ -421,7 +421,7 @@
   "Name of the newsticker cache file."
   :type 'string
   :group 'newsticker-miscellaneous)
-(make-obsolete 'newsticker-cache-filename 'newsticker-dir "23.1")
+(make-obsolete-variable 'newsticker-cache-filename 'newsticker-dir "23.1")
 
 (defcustom newsticker-dir
   (locate-user-emacs-file "newsticker/" ".newsticker/")

=== modified file 'lisp/net/newst-treeview.el'
--- a/lisp/net/newst-treeview.el        2012-06-08 16:39:49 +0000
+++ b/lisp/net/newst-treeview.el        2012-09-25 04:13:02 +0000
@@ -128,7 +128,7 @@
   "Name of the newsticker groups settings file."
   :type 'string
   :group 'newsticker-treeview)
-(make-obsolete 'newsticker-groups-filename 'newsticker-dir "23.1")
+(make-obsolete-variable 'newsticker-groups-filename 'newsticker-dir "23.1")
 
 ;; ======================================================================
 ;;; internal variables

=== modified file 'lisp/net/snmp-mode.el'
--- a/lisp/net/snmp-mode.el     2012-07-11 23:13:41 +0000
+++ b/lisp/net/snmp-mode.el     2012-09-25 04:13:02 +0000
@@ -175,9 +175,9 @@
 (defvar snmp-font-lock-keywords-3
   (append
    '(("\\([^\n]+\\)[ \t]+::=[ \t]+\\(SEQUENCE\\)[ \t]+{"
-      (1 font-lock-reference-face) (2 font-lock-keyword-face))
+      (1 font-lock-constant-face) (2 font-lock-keyword-face))
      ("::=[ \t]*{[ \t]*\\([a-z0-9].*[ \t]+\\)?\\([0-9]+\\)[ \t]*}"
-      (1 font-lock-reference-face nil t) (2 font-lock-variable-name-face)))
+      (1 font-lock-constant-face nil t) (2 font-lock-variable-name-face)))
    snmp-font-lock-keywords-2)
   "Gaudy SNMP MIB mode expression highlighting.")
 

=== modified file 'lisp/password-cache.el'
--- a/lisp/password-cache.el    2012-01-19 07:21:25 +0000
+++ b/lisp/password-cache.el    2012-09-25 04:13:02 +0000
@@ -102,13 +102,12 @@
 correct.  It is better to check the password before caching.  If
 you must use this function, take care to check passwords and
 remove incorrect ones from the cache."
+  (declare (obsolete password-read "23.1"))
   (let ((password (password-read prompt key)))
     (when (and password key)
       (password-cache-add key password))
     password))
 
-(make-obsolete 'password-read-and-add 'password-read "23.1")
-
 (defun password-cache-remove (key)
   "Remove password indexed by KEY from password cache.
 This is typically run by a timer setup from `password-cache-add',

=== modified file 'lisp/pcomplete.el'
--- a/lisp/pcomplete.el 2012-09-17 14:45:51 +0000
+++ b/lisp/pcomplete.el 2012-09-25 04:13:02 +0000
@@ -724,6 +724,7 @@
 
 (defun pcomplete-parse-comint-arguments ()
   "Parse whitespace separated arguments in the current region."
+  (declare (obsolete comint-parse-pcomplete-arguments "24.1"))
   (let ((begin (save-excursion (comint-bol nil) (point)))
        (end (point))
        begins args)
@@ -743,8 +744,6 @@
        (push (buffer-substring-no-properties (car begins) (point))
               args))
       (cons (nreverse args) (nreverse begins)))))
-(make-obsolete 'pcomplete-parse-comint-arguments
-               'comint-parse-pcomplete-arguments "24.1")
 
 (defun pcomplete-parse-arguments (&optional expand-p)
   "Parse the command line arguments.  Most completions need this info."

=== modified file 'lisp/progmodes/cwarn.el'
--- a/lisp/progmodes/cwarn.el   2012-07-11 23:13:41 +0000
+++ b/lisp/progmodes/cwarn.el   2012-09-25 04:13:02 +0000
@@ -191,13 +191,7 @@
   (if font-lock-mode (font-lock-fontify-buffer)))
 
 ;;;###autoload
-(defun turn-on-cwarn-mode ()
-  "Turn on CWarn mode.
-
-This function is designed to be added to hooks, for example:
-  (add-hook 'c-mode-hook 'turn-on-cwarn-mode)"
-  (cwarn-mode 1))
-(make-obsolete 'turn-on-cwarn-mode 'cwarn-mode "24.1")
+(define-obsolete-function-alias 'turn-on-cwarn-mode 'cwarn-mode "24.1")
 
 ;;}}}
 ;;{{{ Help functions

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2012-09-05 07:05:56 +0000
+++ b/lisp/progmodes/sh-script.el       2012-09-25 04:13:02 +0000
@@ -4079,11 +4079,10 @@
 (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)))
-(make-obsolete 'sh--maybe-here-document
-               'sh-electric-here-document-mode "24.3")
 
 (defun sh--maybe-here-document ()
   (or (not (looking-back "[^<]<<"))

=== modified file 'lisp/progmodes/vera-mode.el'
--- a/lisp/progmodes/vera-mode.el       2012-06-08 16:39:49 +0000
+++ b/lisp/progmodes/vera-mode.el       2012-09-25 04:13:02 +0000
@@ -587,12 +587,6 @@
 ;;; Font locking
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; XEmacs compatibility
-(when (featurep 'xemacs)
-  (require 'font-lock)
-  (copy-face 'font-lock-reference-face 'font-lock-constant-face)
-  (copy-face 'font-lock-preprocessor-face 'font-lock-builtin-face))
-
 (defun vera-font-lock-match-item (limit)
   "Match, and move over, any declaration item after point.
 Adapted from `font-lock-match-c-style-declaration-item-and-skip-to-next'."

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2012-08-15 16:29:11 +0000
+++ b/lisp/progmodes/which-func.el      2012-09-25 04:13:02 +0000
@@ -234,9 +234,7 @@
         (error "Error in which-func-update: %S" info))))))
 
 ;;;###autoload
-(defun which-func-mode (&optional arg)
-  (which-function-mode arg))
-(make-obsolete 'which-func-mode 'which-function-mode "24.1")
+(define-obsolete-function-alias 'which-func-mode 'which-function-mode "24.1")
 
 (defvar which-func-update-timer nil)
 

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2012-09-20 21:57:13 +0000
+++ b/lisp/replace.el   2012-09-25 04:13:02 +0000
@@ -378,35 +378,33 @@
 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."
+  (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-to-history-variable 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 (and transient-mark-mode mark-active)
-              (region-beginning))
-          (if (and transient-mark-mode mark-active)
-              (region-end))))))
+     (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-to-history-variable 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 (and transient-mark-mode mark-active)
+                (region-beginning))
+            (if (and transient-mark-mode mark-active)
+                (region-end))))))
   (perform-replace regexp (cons 'replace-eval-replacement to-expr)
                   t 'literal delimited nil nil start end))
 
-(make-obsolete 'query-replace-regexp-eval
-  "for interactive use, use the special `\\,' feature of
-`query-replace-regexp' instead.  Non-interactively, a loop
-using `search-forward-regexp' and `replace-match' is preferred." "22.1")
-
 (defun map-query-replace-regexp (regexp to-strings &optional n start end)
   "Replace some matches for REGEXP with various strings, in rotation.
 The second argument TO-STRINGS contains the replacement strings, separated

=== modified file 'lisp/savehist.el'
--- a/lisp/savehist.el  2012-08-15 16:29:11 +0000
+++ b/lisp/savehist.el  2012-09-25 04:13:02 +0000
@@ -209,6 +209,7 @@
 If `savehist-file' is in the old format that doesn't record
 the value of `savehist-minibuffer-history-variables', that
 value is deducted from the contents of the file."
+  (declare (obsolete savehist-mode "22.1"))
   (savehist-mode 1)
   ;; Old versions of savehist distributed with XEmacs didn't save
   ;; savehist-minibuffer-history-variables.  If that variable is nil
@@ -225,7 +226,6 @@
                ;; Collect VAR, i.e. (nth form 1).
                 (push (nth 1 form) vars))
               vars)))))
-(make-obsolete 'savehist-load 'savehist-mode "22.1")
 
 (defun savehist-install ()
   "Hook savehist into Emacs.

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-09-22 15:46:57 +0000
+++ b/lisp/simple.el    2012-09-25 04:13:02 +0000
@@ -6380,9 +6380,8 @@
       (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)))
-(make-obsolete 'choose-completion-delete-max-match
-               'choose-completion-guess-base-position "23.2")
 
 (defvar choose-completion-string-functions nil
   "Functions that may override the normal insertion of a completion choice.

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-09-22 16:28:46 +0000
+++ b/lisp/subr.el      2012-09-25 04:13:02 +0000
@@ -461,18 +461,18 @@
       (setq tail (cdr tail)))
     value))
 
-(make-obsolete 'assoc-ignore-case 'assoc-string "22.1")
 (defun assoc-ignore-case (key alist)
   "Like `assoc', but ignores differences in case and text representation.
 KEY must be a string.  Upper-case and lower-case letters are treated as equal.
 Unibyte strings are converted to multibyte for comparison."
+  (declare (obsolete assoc-string "22.1"))
   (assoc-string key alist t))
 
-(make-obsolete 'assoc-ignore-representation 'assoc-string "22.1")
 (defun assoc-ignore-representation (key alist)
   "Like `assoc', but ignores differences in text representation.
 KEY must be a string.
 Unibyte strings are converted to multibyte for comparison."
+  (declare (obsolete assoc-string "22.1"))
   (assoc-string key alist nil))
 
 (defun member-ignore-case (elt list)
@@ -1179,12 +1179,13 @@
   "Mocklisp-compatibility insert function.
 Like the function `insert' except that any argument that is a number
 is converted into a string by expressing it in decimal."
+  (declare (obsolete insert "22.1"))
   (dolist (el args)
     (insert (if (integerp el) (number-to-string el) el))))
-(make-obsolete 'insert-string 'insert "22.1")
 
-(defun makehash (&optional test) (make-hash-table :test (or test 'eql)))
-(make-obsolete 'makehash 'make-hash-table "22.1")
+(defun makehash (&optional test)
+  (declare (obsolete make-hash-table "22.1"))
+  (make-hash-table :test (or test 'eql)))
 
 ;; These are used by VM and some old programs
 (defalias 'focus-frame 'ignore "")
@@ -1250,11 +1251,6 @@
 (make-obsolete 'process-filter-multibyte-p nil "23.1")
 (make-obsolete 'set-process-filter-multibyte nil "23.1")
 
-(make-obsolete-variable
- 'mode-line-inverse-video
- "use the appropriate faces instead."
- "21.1")
-
 ;; Lisp manual only updated in 22.1.
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
   "before 19.34")
@@ -1911,8 +1907,8 @@
   "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)))
-(make-obsolete 'eval-next-after-load `eval-after-load "23.2")
 
 (defun display-delayed-warnings ()
   "Display delayed warnings from `delayed-warnings-list'.

=== modified file 'lisp/term.el'
--- a/lisp/term.el      2012-09-01 22:03:06 +0000
+++ b/lisp/term.el      2012-09-25 04:13:02 +0000
@@ -4048,6 +4048,7 @@
 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)
         (candidates (mapcar (function (lambda (x) (list x))) candidates))
         (completions (all-completions stub candidates)))
@@ -4081,8 +4082,6 @@
                   (t
                    (message "Partially completed")
                    'partial)))))))
-(make-obsolete 'term-dynamic-simple-complete 'completion-in-region "23.2")
-
 
 (defun term-dynamic-list-filename-completions ()
   "List in help buffer possible completions of the filename at point."

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-08-28 16:01:59 +0000
+++ b/lisp/url/ChangeLog        2012-09-25 04:13:02 +0000
@@ -1,3 +1,9 @@
+2012-09-25  Chong Yidong  <address@hidden>
+
+       * url-parse.el (url-recreate-url-attributes):
+       * url-util.el (url-generate-unique-filename): Use declare to mark
+       obsolete.
+
 2012-08-14  Stefan Monnier  <address@hidden>
 
        * url-http.el (url-http-parse-headers): Re-enable file-name-handlers

=== modified file 'lisp/url/url-parse.el'
--- a/lisp/url/url-parse.el     2012-08-15 16:29:11 +0000
+++ b/lisp/url/url-parse.el     2012-09-25 04:13:02 +0000
@@ -98,6 +98,7 @@
 
 (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)
@@ -105,7 +106,6 @@
                              (concat (car x) "=" (cdr x))
                            (car x)))
                        (url-attributes urlobj) ";"))))
-(make-obsolete 'url-recreate-url-attributes nil "24.3")
 
 ;;;###autoload
 (defun url-generic-parse-url (url)

=== modified file 'lisp/url/url-util.el'
--- a/lisp/url/url-util.el      2012-08-12 17:35:15 +0000
+++ b/lisp/url/url-util.el      2012-09-25 04:13:02 +0000
@@ -593,6 +593,7 @@
 
 (defun url-generate-unique-filename (&optional fmt)
   "Generate a unique filename in `url-temporary-directory'."
+  (declare (obsolete make-temp-file "23.1"))
   ;; This variable is obsolete, but so is this function.
   (let ((tempdir (with-no-warnings url-temporary-directory)))
     (if (not fmt)
@@ -614,7 +615,6 @@
          (setq x (1+ x)
                fname (format fmt (concat base (int-to-string x)))))
        (expand-file-name fname tempdir)))))
-(make-obsolete 'url-generate-unique-filename 'make-temp-file "23.1")
 
 (defun url-extract-mime-headers ()
   "Set `url-current-mime-headers' in current buffer."

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2012-05-25 00:55:40 +0000
+++ b/lisp/vc/ediff-init.el     2012-09-25 04:13:02 +0000
@@ -753,6 +753,7 @@
   "Check the current version against MAJOR and MINOR version numbers.
 The comparison uses operator OP, which may be any of: =, >, >=, <, <=.
 TYPE-OF-EMACS is either 'xemacs or 'emacs."
+  (declare (obsolete version< "23.1"))
   (and (cond ((eq type-of-emacs 'xemacs) (featurep 'xemacs))
             ((eq type-of-emacs 'emacs) (featurep 'emacs))
             (t))
@@ -767,9 +768,6 @@
             (t
              (error "%S: Invalid op in ediff-check-version" op)))))
 
-;; ediff-check-version seems to be totally unused anyway.
-(make-obsolete 'ediff-check-version 'version< "23.1")
-
 (defun ediff-color-display-p ()
   (condition-case nil
       (if (featurep 'xemacs)

=== modified file 'lisp/vc/ediff-wind.el'
--- a/lisp/vc/ediff-wind.el     2012-08-15 16:29:11 +0000
+++ b/lisp/vc/ediff-wind.el     2012-09-25 04:13:02 +0000
@@ -63,13 +63,11 @@
 
 ;; 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 (ediff-window-display-p)
       'ediff-setup-windows-multiframe
     'ediff-setup-windows-plain))
 
-(make-obsolete 'ediff-choose-window-setup-function-automatically
-              'ediff-setup-windows-default "24.3")
-
 (defcustom ediff-window-setup-function 'ediff-setup-windows-default
   "Function called to set up windows.
 Ediff provides a choice of three functions:

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2012-09-24 12:23:25 +0000
+++ b/lisp/vc/vc.el     2012-09-25 04:13:02 +0000
@@ -1506,8 +1506,9 @@
       (when (listp switches) switches))))
 
 ;; Old def for compatibility with Emacs-21.[123].
-(defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff))
-(make-obsolete 'vc-diff-switches-list 'vc-switches "22.1")
+(defmacro vc-diff-switches-list (backend)
+  (declare (obsolete vc-switches "22.1"))
+  `(vc-switches ',backend 'diff))
 
 (defun vc-diff-finish (buffer messages)
   ;; The empty sync output case has already been handled, so the only

=== modified file 'lisp/view.el'
--- a/lisp/view.el      2012-03-16 01:40:20 +0000
+++ b/lisp/view.el      2012-09-25 04:13:02 +0000
@@ -513,6 +513,7 @@
 function `view-mode-exit'.  If `view-return-to-alist' contains an
 entry for the selected window, purge that entry from
 `view-return-to-alist' before adding ITEM."
+  (declare (obsolete "this function has no effect." "24.1"))
   (with-current-buffer buffer
     (when view-return-to-alist
       (let* ((list view-return-to-alist)
@@ -535,7 +536,6 @@
     (when item
       (setq view-return-to-alist
            (cons item view-return-to-alist)))))
-(make-obsolete 'view-return-to-alist-update "this function has no effect." 
"24.1")
 
 ;;;###autoload
 (defun view-mode-enter (&optional quit-restore exit-action)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-24 22:47:51 +0000
+++ b/src/ChangeLog     2012-09-25 04:13:02 +0000
@@ -1,3 +1,7 @@
+2012-09-25  Chong Yidong  <address@hidden>
+
+       * xdisp.c (mode_line_inverse_video): Delete obsolete variable.
+
 2012-09-24  Stefan Monnier  <address@hidden>
 
        * bytecode.c (exec_byte_code): Signal an error instead of aborting,

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-09-23 08:44:20 +0000
+++ b/src/xdisp.c       2012-09-25 04:13:02 +0000
@@ -20162,10 +20162,6 @@
      this.  */
   it.paragraph_embedding = L2R;
 
-  if (! mode_line_inverse_video)
-    /* Force the menu-bar to be displayed in the default face.  */
-    it.base_face_id = it.face_id = DEFAULT_FACE_ID;
-
   /* Clear all rows of the menu bar.  */
   for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i)
     {
@@ -20335,10 +20331,6 @@
 
   it.glyph_row->mode_line_p = 1;
 
-  if (! mode_line_inverse_video)
-    /* Force the mode-line to be displayed in the default face.  */
-    it.base_face_id = it.face_id = DEFAULT_FACE_ID;
-
   /* FIXME: This should be controlled by a user option.  But
      supporting such an option is not trivial, since the mode line is
      made up of many separate strings.  */
@@ -28930,12 +28922,6 @@
 If `word-wrap' is enabled, you might want to reduce this.  */);
   Vtruncate_partial_width_windows = make_number (50);
 
-  DEFVAR_BOOL ("mode-line-inverse-video", mode_line_inverse_video,
-    doc: /* When nil, display the mode-line/header-line/menu-bar in the 
default face.
-Any other value means to use the appropriate face, `mode-line',
-`header-line', or `menu' respectively.  */);
-  mode_line_inverse_video = 1;
-
   DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit,
     doc: /* Maximum buffer size for which line number should be displayed.
 If the buffer is bigger than this, the line number does not appear


reply via email to

[Prev in Thread] Current Thread [Next in Thread]