aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-08-15 09:29:11 -0700
committerGlenn Morris2012-08-15 09:29:11 -0700
commit2a1e24765bc3de7bf72e7117893307f6f6c441be (patch)
tree95cbfdc4e94f4f7c899e2ceea99b771928e4937a
parenteb424fe3d660eebd9b74dd5d2875e2e4b7b3307f (diff)
downloademacs-2a1e24765bc3de7bf72e7117893307f6f6c441be.tar.gz
emacs-2a1e24765bc3de7bf72e7117893307f6f6c441be.zip
Replace version 24.2 with 24.3 where appropriate (hopefully)
-rw-r--r--doc/emacs/ack.texi4
-rw-r--r--etc/NEWS22
-rw-r--r--leim/quail/hangul.el2
-rw-r--r--leim/quail/uni-input.el2
-rw-r--r--lisp/allout.el20
-rw-r--r--lisp/apropos.el14
-rw-r--r--lisp/bindings.el2
-rw-r--r--lisp/buff-menu.el8
-rw-r--r--lisp/calc/README2
-rw-r--r--lisp/calendar/cal-html.el4
-rw-r--r--lisp/calendar/cal-tex.el2
-rw-r--r--lisp/calendar/timeclock.el4
-rw-r--r--lisp/comint.el4
-rw-r--r--lisp/cus-edit.el2
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/custom.el2
-rw-r--r--lisp/dired.el2
-rw-r--r--lisp/ebuff-menu.el2
-rw-r--r--lisp/emacs-lisp/byte-run.el4
-rw-r--r--lisp/emacs-lisp/cl-lib.el4
-rw-r--r--lisp/emacs-lisp/cl.el54
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/emacs-lisp/eieio.el2
-rw-r--r--lisp/emacs-lock.el2
-rw-r--r--lisp/emulation/crisp.el2
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/erc/erc-dcc.el2
-rw-r--r--lisp/erc/erc-match.el2
-rw-r--r--lisp/eshell/esh-mode.el2
-rw-r--r--lisp/eshell/eshell.el4
-rw-r--r--lisp/ffap.el2
-rw-r--r--lisp/files.el6
-rw-r--r--lisp/frame.el2
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-picon.el2
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/gnus/nnmail.el2
-rw-r--r--lisp/help.el2
-rw-r--r--lisp/hexl.el2
-rw-r--r--lisp/image.el4
-rw-r--r--lisp/international/mule-cmds.el10
-rw-r--r--lisp/international/quail.el4
-rw-r--r--lisp/international/robin.el4
-rw-r--r--lisp/ldefs-boot.el2
-rw-r--r--lisp/mail/emacsbug.el2
-rw-r--r--lisp/man.el6
-rw-r--r--lisp/mpc.el2
-rw-r--r--lisp/net/dbus.el2
-rw-r--r--lisp/net/rcirc.el2
-rw-r--r--lisp/net/tramp-smb.el6
-rw-r--r--lisp/net/tramp.el2
-rw-r--r--lisp/newcomment.el2
-rw-r--r--lisp/nxml/nxml-glyph.el2
-rw-r--r--lisp/obsolete/assoc.el2
-rw-r--r--lisp/obsolete/bruce.el2
-rw-r--r--lisp/obsolete/cust-print.el2
-rw-r--r--lisp/obsolete/ledit.el2
-rw-r--r--lisp/obsolete/mailpost.el2
-rw-r--r--lisp/obsolete/mouse-sel.el4
-rw-r--r--lisp/obsolete/patcomp.el2
-rw-r--r--lisp/pcmpl-rpm.el4
-rw-r--r--lisp/pcomplete.el4
-rw-r--r--lisp/progmodes/compile.el6
-rw-r--r--lisp/progmodes/perl-mode.el2
-rw-r--r--lisp/progmodes/python.el22
-rw-r--r--lisp/progmodes/sh-script.el2
-rw-r--r--lisp/progmodes/which-func.el4
-rw-r--r--lisp/savehist.el4
-rw-r--r--lisp/server.el2
-rw-r--r--lisp/simple.el4
-rw-r--r--lisp/strokes.el2
-rw-r--r--lisp/subr.el6
-rw-r--r--lisp/textmodes/rst.el12
-rw-r--r--lisp/textmodes/tex-mode.el4
-rw-r--r--lisp/url/url-parse.el2
-rw-r--r--lisp/vc/add-log.el2
-rw-r--r--lisp/vc/diff-mode.el4
-rw-r--r--lisp/vc/ediff-wind.el4
-rw-r--r--lisp/vc/pcvs-util.el2
-rw-r--r--lisp/vc/smerge-mode.el4
-rw-r--r--lisp/vc/vc.el2
81 files changed, 186 insertions, 182 deletions
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 2c4ed1fbcc8..487e3c19c16 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -365,7 +365,7 @@ flow control.
365 365
366@item 366@item
367Fabián E. Gallina rewrote @file{python.el}, the major mode for the 367Fabián E. Gallina rewrote @file{python.el}, the major mode for the
368Python programming language used in Emacs 24.2 onwards. 368Python programming language used in Emacs 24.3 onwards.
369 369
370@item 370@item
371Kevin Gallo added multiple-frame support for Windows NT and wrote 371Kevin Gallo added multiple-frame support for Windows NT and wrote
@@ -715,7 +715,7 @@ the current window on which point is; @file{cap-words.el}, a minor mode
715for motion in ``CapitalizedWordIdentifiers''; @file{latin1-disp.el}, a 715for motion in ``CapitalizedWordIdentifiers''; @file{latin1-disp.el}, a
716package that lets you display ISO 8859 characters on Latin-1 terminals 716package that lets you display ISO 8859 characters on Latin-1 terminals
717by setting up appropriate display tables; the version of 717by setting up appropriate display tables; the version of
718@file{python.el} used prior to Emacs 24.2; @file{smiley.el}, a 718@file{python.el} used prior to Emacs 24.3; @file{smiley.el}, a
719facility for displaying smiley faces; @file{sym-comp.el}, a library 719facility for displaying smiley faces; @file{sym-comp.el}, a library
720for performing mode-dependent symbol completion; @file{benchmark.el} 720for performing mode-dependent symbol completion; @file{benchmark.el}
721for timing code execution; and @file{tool-bar.el}, a mode to control 721for timing code execution; and @file{tool-bar.el}, a mode to control
diff --git a/etc/NEWS b/etc/NEWS
index 5b0291a8f05..6250bcf3d46 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -21,7 +21,7 @@ When you add a new item, please add it without either +++ or ---
21so we will look at it and add it to the manual. 21so we will look at it and add it to the manual.
22 22
23 23
24* Installation Changes in Emacs 24.2 24* Installation Changes in Emacs 24.3
25 25
26** New configure option '--without-all' to disable additonal features. 26** New configure option '--without-all' to disable additonal features.
27This disables most of the features that are normally enabled by default. 27This disables most of the features that are normally enabled by default.
@@ -61,7 +61,7 @@ Lisp_Object type no longer uses a union to implement the compile time
61check that this option enables. 61check that this option enables.
62 62
63 63
64* Startup Changes in Emacs 24.2 64* Startup Changes in Emacs 24.3
65 65
66** Emacs no longer searches for `leim-list.el' files beneath the standard 66** Emacs no longer searches for `leim-list.el' files beneath the standard
67lisp/ directory. There should not be any there anyway. If you have 67lisp/ directory. There should not be any there anyway. If you have
@@ -71,7 +71,7 @@ been adding them there, put them somewhere else, eg site-lisp.
71** The `--no-site-lisp' command line option now works for Nextstep builds. 71** The `--no-site-lisp' command line option now works for Nextstep builds.
72 72
73 73
74* Changes in Emacs 24.2 74* Changes in Emacs 24.3
75 75
76** Help changes 76** Help changes
77 77
@@ -158,7 +158,7 @@ for it.
158The PCL-CVS commands are still available via the keyboard. 158The PCL-CVS commands are still available via the keyboard.
159 159
160 160
161* Editing Changes in Emacs 24.2 161* Editing Changes in Emacs 24.3
162 162
163** New option `delete-trailing-lines' specifies whether the M-x 163** New option `delete-trailing-lines' specifies whether the M-x
164delete-trailing-whitespace command should delete trailing lines at the 164delete-trailing-whitespace command should delete trailing lines at the
@@ -189,7 +189,7 @@ It copies the region-rectangle as the last rectangle kill.
189** New input method `vietnamese-vni'. 189** New input method `vietnamese-vni'.
190 190
191 191
192* Changes in Specialized Modes and Packages in Emacs 24.2 192* Changes in Specialized Modes and Packages in Emacs 24.3
193 193
194** Term changes 194** Term changes
195 195
@@ -502,9 +502,9 @@ inefficiency, and not namespace-clean.
502*** cust-print.el 502*** cust-print.el
503 503
504 504
505* New Modes and Packages in Emacs 24.2 505* New Modes and Packages in Emacs 24.3
506 506
507* Incompatible Lisp Changes in Emacs 24.2 507* Incompatible Lisp Changes in Emacs 24.3
508 508
509** The function `x-select-font' can return a font spec, instead of a 509** The function `x-select-font' can return a font spec, instead of a
510font name as a string. Whether it returns a font spec or a font name 510font name as a string. Whether it returns a font spec or a font name
@@ -570,7 +570,7 @@ are deprecated and will be removed eventually.
570*** `last-input-char' and `last-command-char' 570*** `last-input-char' and `last-command-char'
571 571
572 572
573* Lisp changes in Emacs 24.2 573* Lisp changes in Emacs 24.3
574 574
575** New functions `autoloadp' and `autoload-do-load'. 575** New functions `autoloadp' and `autoload-do-load'.
576 576
@@ -624,7 +624,7 @@ by the underlying C implementation.
624** `automount-dir-prefix' is obsolete. 624** `automount-dir-prefix' is obsolete.
625** `buffer-has-markers-at' is obsolete. 625** `buffer-has-markers-at' is obsolete.
626 626
627* Changes in Emacs 24.2 on non-free operating systems 627* Changes in Emacs 24.3 on non-free operating systems
628 628
629** New configure.bat options on MS-Windows: 629** New configure.bat options on MS-Windows:
630 630
@@ -636,6 +636,10 @@ Emacs now supports mouse highlight, help-echo (in the echo area), and
636mouse-autoselect-window. 636mouse-autoselect-window.
637 637
638** On MS-Windows Vista and later Emacs now supports symbolic links. 638** On MS-Windows Vista and later Emacs now supports symbolic links.
639
640* Changes in Emacs 24.2
641
642** This release mainly fixes a security issue.
639 643
640 644
641* Installation Changes in Emacs 24.1 645* Installation Changes in Emacs 24.1
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index c66c47b47fc..fd1dc0d2954 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -532,7 +532,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'."
532 532
533(define-obsolete-function-alias 533(define-obsolete-function-alias
534 'hangul-input-method-inactivate 534 'hangul-input-method-inactivate
535 'hangul-input-method-deactivate "24.2") 535 'hangul-input-method-deactivate "24.3")
536 536
537(defun hangul-input-method-help () 537(defun hangul-input-method-help ()
538 "Describe the current Hangul input method." 538 "Describe the current Hangul input method."
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 1cab31f83bb..7946c08e9e5 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -114,7 +114,7 @@ While this input method is active, the variable
114 114
115(define-obsolete-function-alias 115(define-obsolete-function-alias
116 'ucs-input-inactivate 116 'ucs-input-inactivate
117 'ucs-input-deactivate "24.2") 117 'ucs-input-deactivate "24.3")
118 118
119(defun ucs-input-help () 119(defun ucs-input-help ()
120 (interactive) 120 (interactive)
diff --git a/lisp/allout.el b/lisp/allout.el
index 9034d009797..acf0b7d75b6 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1415,7 +1415,7 @@ their settings before allout-mode was started."
1415 1415
1416;;;_ = allout-exposure-change-functions 1416;;;_ = allout-exposure-change-functions
1417(define-obsolete-variable-alias 'allout-exposure-change-hook 1417(define-obsolete-variable-alias 'allout-exposure-change-hook
1418 'allout-exposure-change-functions "24.2") 1418 'allout-exposure-change-functions "24.3")
1419(defcustom allout-exposure-change-functions nil 1419(defcustom allout-exposure-change-functions nil
1420 "Abnormal hook run after allout outline subtree exposure changes. 1420 "Abnormal hook run after allout outline subtree exposure changes.
1421It is run at the conclusion of `allout-flag-region'. 1421It is run at the conclusion of `allout-flag-region'.
@@ -1429,11 +1429,11 @@ Functions on the hook must take three arguments:
1429This hook might be invoked multiple times by a single command." 1429This hook might be invoked multiple times by a single command."
1430 :type 'hook 1430 :type 'hook
1431 :group 'allout 1431 :group 'allout
1432 :version "24.2") 1432 :version "24.3")
1433 1433
1434;;;_ = allout-structure-added-functions 1434;;;_ = allout-structure-added-functions
1435(define-obsolete-variable-alias 'allout-structure-added-hook 1435(define-obsolete-variable-alias 'allout-structure-added-hook
1436 'allout-structure-added-functions "24.2") 1436 'allout-structure-added-functions "24.3")
1437(defcustom allout-structure-added-functions nil 1437(defcustom allout-structure-added-functions nil
1438 "Abnormal hook run after adding items to an Allout outline. 1438 "Abnormal hook run after adding items to an Allout outline.
1439Functions on the hook should take two arguments: 1439Functions on the hook should take two arguments:
@@ -1444,11 +1444,11 @@ Functions on the hook should take two arguments:
1444This hook might be invoked multiple times by a single command." 1444This hook might be invoked multiple times by a single command."
1445 :type 'hook 1445 :type 'hook
1446 :group 'allout 1446 :group 'allout
1447 :version "24.2") 1447 :version "24.3")
1448 1448
1449;;;_ = allout-structure-deleted-functions 1449;;;_ = allout-structure-deleted-functions
1450(define-obsolete-variable-alias 'allout-structure-deleted-hook 1450(define-obsolete-variable-alias 'allout-structure-deleted-hook
1451 'allout-structure-deleted-functions "24.2") 1451 'allout-structure-deleted-functions "24.3")
1452(defcustom allout-structure-deleted-functions nil 1452(defcustom allout-structure-deleted-functions nil
1453 "Abnormal hook run after deleting subtrees from an Allout outline. 1453 "Abnormal hook run after deleting subtrees from an Allout outline.
1454Functions on the hook must take two arguments: 1454Functions on the hook must take two arguments:
@@ -1462,11 +1462,11 @@ specifically edits that native allout routines do not control.
1462This hook might be invoked multiple times by a single command." 1462This hook might be invoked multiple times by a single command."
1463 :type 'hook 1463 :type 'hook
1464 :group 'allout 1464 :group 'allout
1465 :version "24.2") 1465 :version "24.3")
1466 1466
1467;;;_ = allout-structure-shifted-functions 1467;;;_ = allout-structure-shifted-functions
1468(define-obsolete-variable-alias 'allout-structure-shifted-hook 1468(define-obsolete-variable-alias 'allout-structure-shifted-hook
1469 'allout-structure-shifted-functions "24.2") 1469 'allout-structure-shifted-functions "24.3")
1470(defcustom allout-structure-shifted-functions nil 1470(defcustom allout-structure-shifted-functions nil
1471 "Abnormal hook run after shifting items in an Allout outline. 1471 "Abnormal hook run after shifting items in an Allout outline.
1472Functions on the hook should take two arguments: 1472Functions on the hook should take two arguments:
@@ -1480,14 +1480,14 @@ that native allout routines do not control.
1480This hook might be invoked multiple times by a single command." 1480This hook might be invoked multiple times by a single command."
1481 :type 'hook 1481 :type 'hook
1482 :group 'allout 1482 :group 'allout
1483 :version "24.2") 1483 :version "24.3")
1484 1484
1485;;;_ = allout-after-copy-or-kill-hook 1485;;;_ = allout-after-copy-or-kill-hook
1486(defcustom allout-after-copy-or-kill-hook nil 1486(defcustom allout-after-copy-or-kill-hook nil
1487 "Normal hook run after copying outline text.." 1487 "Normal hook run after copying outline text.."
1488 :type 'hook 1488 :type 'hook
1489 :group 'allout 1489 :group 'allout
1490 :version "24.2") 1490 :version "24.3")
1491 1491
1492;;;_ = allout-post-undo-hook 1492;;;_ = allout-post-undo-hook
1493(defcustom allout-post-undo-hook nil 1493(defcustom allout-post-undo-hook nil
@@ -1496,7 +1496,7 @@ The item that's current when the hook is run *may* be the one
1496that was affected by the undo.." 1496that was affected by the undo.."
1497 :type 'hook 1497 :type 'hook
1498 :group 'allout 1498 :group 'allout
1499 :version "24.2") 1499 :version "24.3")
1500 1500
1501;;;_ = allout-outside-normal-auto-fill-function 1501;;;_ = allout-outside-normal-auto-fill-function
1502(defvar allout-outside-normal-auto-fill-function nil 1502(defvar allout-outside-normal-auto-fill-function nil
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 6c6e3b325e8..88d5602a023 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -88,44 +88,44 @@ include key-binding information in its output."
88 '((t (:inherit bold))) 88 '((t (:inherit bold)))
89 "Face for the symbol name in Apropos output." 89 "Face for the symbol name in Apropos output."
90 :group 'apropos 90 :group 'apropos
91 :version "24.2") 91 :version "24.3")
92 92
93(defface apropos-keybinding 93(defface apropos-keybinding
94 '((t (:inherit underline))) 94 '((t (:inherit underline)))
95 "Face for lists of keybinding in Apropos output." 95 "Face for lists of keybinding in Apropos output."
96 :group 'apropos 96 :group 'apropos
97 :version "24.2") 97 :version "24.3")
98 98
99(defface apropos-property 99(defface apropos-property
100 '((t (:inherit font-lock-builtin-face))) 100 '((t (:inherit font-lock-builtin-face)))
101 "Face for property name in apropos output, or nil for none." 101 "Face for property name in apropos output, or nil for none."
102 :group 'apropos 102 :group 'apropos
103 :version "24.2") 103 :version "24.3")
104 104
105(defface apropos-function-button 105(defface apropos-function-button
106 '((t (:inherit (font-lock-function-name-face button)))) 106 '((t (:inherit (font-lock-function-name-face button))))
107 "Button face indicating a function, macro, or command in Apropos." 107 "Button face indicating a function, macro, or command in Apropos."
108 :group 'apropos 108 :group 'apropos
109 :version "24.2") 109 :version "24.3")
110 110
111(defface apropos-variable-button 111(defface apropos-variable-button
112 '((t (:inherit (font-lock-variable-name-face button)))) 112 '((t (:inherit (font-lock-variable-name-face button))))
113 "Button face indicating a variable in Apropos." 113 "Button face indicating a variable in Apropos."
114 :group 'apropos 114 :group 'apropos
115 :version "24.2") 115 :version "24.3")
116 116
117(defface apropos-misc-button 117(defface apropos-misc-button
118 '((t (:inherit (font-lock-constant-face button)))) 118 '((t (:inherit (font-lock-constant-face button))))
119 "Button face indicating a miscellaneous object type in Apropos." 119 "Button face indicating a miscellaneous object type in Apropos."
120 :group 'apropos 120 :group 'apropos
121 :version "24.2") 121 :version "24.3")
122 122
123(defcustom apropos-match-face 'match 123(defcustom apropos-match-face 'match
124 "Face for matching text in Apropos documentation/value, or nil for none. 124 "Face for matching text in Apropos documentation/value, or nil for none.
125This applies when you look for matches in the documentation or variable value 125This applies when you look for matches in the documentation or variable value
126for the pattern; the part that matches gets displayed in this font." 126for the pattern; the part that matches gets displayed in this font."
127 :group 'apropos 127 :group 'apropos
128 :version "24.2") 128 :version "24.3")
129 129
130(defcustom apropos-sort-by-scores nil 130(defcustom apropos-sort-by-scores nil
131 "Non-nil means sort matches by scores; best match is shown first. 131 "Non-nil means sort matches by scores; best match is shown first.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 5d8fa261a21..c20a7f30eea 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -143,7 +143,7 @@ message to display when the mouse is moved over the mode line.
143If the text at the mouse position has a `help-echo' text 143If the text at the mouse position has a `help-echo' text
144property, that overrides this variable." 144property, that overrides this variable."
145 :type '(choice (const :tag "No help" :value nil) string) 145 :type '(choice (const :tag "No help" :value nil) string)
146 :version "24.2" 146 :version "24.3"
147 :group 'mode-line) 147 :group 'mode-line)
148 148
149(defvar mode-line-front-space '(:eval (if (display-graphic-p) " " "-")) 149(defvar mode-line-front-space '(:eval (if (display-graphic-p) " " "-"))
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 490d59a92c0..589b6ebc47a 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -57,23 +57,23 @@ the name column is assigned width `Buffer-menu-buffer+size-width'
57minus `Buffer-menu-size-width'. This use is deprecated." 57minus `Buffer-menu-size-width'. This use is deprecated."
58 :type 'number 58 :type 'number
59 :group 'Buffer-menu 59 :group 'Buffer-menu
60 :version "24.2") 60 :version "24.3")
61 61
62(make-obsolete-variable 'Buffer-menu-buffer+size-width 62(make-obsolete-variable 'Buffer-menu-buffer+size-width
63 "`Buffer-menu-name-width' and `Buffer-menu-size-width'" 63 "`Buffer-menu-name-width' and `Buffer-menu-size-width'"
64 "24.2") 64 "24.3")
65 65
66(defcustom Buffer-menu-name-width 19 66(defcustom Buffer-menu-name-width 19
67 "Width of buffer size column in the Buffer Menu." 67 "Width of buffer size column in the Buffer Menu."
68 :type 'number 68 :type 'number
69 :group 'Buffer-menu 69 :group 'Buffer-menu
70 :version "24.2") 70 :version "24.3")
71 71
72(defcustom Buffer-menu-size-width 7 72(defcustom Buffer-menu-size-width 7
73 "Width of buffer name column in the Buffer Menu." 73 "Width of buffer name column in the Buffer Menu."
74 :type 'number 74 :type 'number
75 :group 'Buffer-menu 75 :group 'Buffer-menu
76 :version "24.2") 76 :version "24.3")
77 77
78(defcustom Buffer-menu-mode-width 16 78(defcustom Buffer-menu-mode-width 16
79 "Width of mode name column in the Buffer Menu." 79 "Width of mode name column in the Buffer Menu."
diff --git a/lisp/calc/README b/lisp/calc/README
index f4f6b0fa0ba..25d1a5e9b58 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -70,7 +70,7 @@ opinions.
70Summary of changes to "Calc" 70Summary of changes to "Calc"
71------- -- ------- -- ---- 71------- -- ------- -- ----
72 72
73Emacs 24.2 73Emacs 24.3
74 74
75Algebraic simplification mode is now the default. 75Algebraic simplification mode is now the default.
76To restrict to the limited simplifications given by the former 76To restrict to the limited simplifications given by the former
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 9e9544d707b..dff370460af 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -68,7 +68,7 @@
68 68
69(defcustom cal-html-holidays t 69(defcustom cal-html-holidays t
70 "If non-nil, include holidays as well as diary entries." 70 "If non-nil, include holidays as well as diary entries."
71 :version "24.2" 71 :version "24.3"
72 :type 'boolean 72 :type 'boolean
73 :group 'calendar-html) 73 :group 'calendar-html)
74 74
@@ -92,7 +92,7 @@
92 "</STYLE>\n\n") 92 "</STYLE>\n\n")
93 "Default cal-html css style. You can override this with a \"cal.css\" file." 93 "Default cal-html css style. You can override this with a \"cal.css\" file."
94 :type 'string 94 :type 'string
95 :version "24.2" ; added SPAN.HOLIDAY 95 :version "24.3" ; added SPAN.HOLIDAY
96 :group 'calendar-html) 96 :group 'calendar-html)
97 97
98;;; End customizable variables. 98;;; End customizable variables.
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 2452f44448c..a40c05f45ca 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -239,7 +239,7 @@ This definition is the heart of the calendar!")
239 239
240(autoload 'holiday-in-range "holidays") 240(autoload 'holiday-in-range "holidays")
241 241
242(define-obsolete-function-alias 'cal-tex-list-holidays 'holiday-in-range "24.2") 242(define-obsolete-function-alias 'cal-tex-list-holidays 'holiday-in-range "24.3")
243 243
244(autoload 'diary-list-entries "diary-lib") 244(autoload 'diary-list-entries "diary-lib")
245 245
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 8ca14b37d70..2ebb8c7c3ae 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -268,7 +268,7 @@ The time is bracketed by <> if you are clocked in, otherwise by [].")
268;;; User Functions: 268;;; User Functions:
269 269
270(define-obsolete-function-alias 'timeclock-modeline-display 270(define-obsolete-function-alias 'timeclock-modeline-display
271 'timeclock-mode-line-display "24.2") 271 'timeclock-mode-line-display "24.3")
272 272
273;;;###autoload 273;;;###autoload
274(defun timeclock-mode-line-display (&optional arg) 274(defun timeclock-mode-line-display (&optional arg)
@@ -649,7 +649,7 @@ arguments of `completing-read'."
649 (mapcar 'list timeclock-reason-list))) 649 (mapcar 'list timeclock-reason-list)))
650 650
651(define-obsolete-function-alias 'timeclock-update-modeline 651(define-obsolete-function-alias 'timeclock-update-modeline
652 'timeclock-update-mode-line "24.2") 652 'timeclock-update-mode-line "24.3")
653 653
654(defun timeclock-update-mode-line () 654(defun timeclock-update-mode-line ()
655 "Update the `timeclock-mode-string' displayed in the mode line. 655 "Update the `timeclock-mode-string' displayed in the mode line.
diff --git a/lisp/comint.el b/lisp/comint.el
index 431d05b75c2..5b0eb3027e6 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3046,7 +3046,7 @@ See `comint-word'."
3046(defun comint--unquote-argument (str) 3046(defun comint--unquote-argument (str)
3047 (car (comint--unquote&requote-argument str))) 3047 (car (comint--unquote&requote-argument str)))
3048(define-obsolete-function-alias 'comint--unquote&expand-filename 3048(define-obsolete-function-alias 'comint--unquote&expand-filename
3049 #'comint--unquote-argument "24.2") 3049 #'comint--unquote-argument "24.3")
3050 3050
3051(defun comint-match-partial-filename () 3051(defun comint-match-partial-filename ()
3052 "Return the unquoted&expanded filename at point, or nil if none is found. 3052 "Return the unquoted&expanded filename at point, or nil if none is found.
@@ -3073,7 +3073,7 @@ Magic characters are those in `comint-file-name-quote-list'."
3073 filename 3073 filename
3074 (save-match-data 3074 (save-match-data
3075 (replace-regexp-in-string "\\\\\\(.\\)" "\\1" filename t)))) 3075 (replace-regexp-in-string "\\\\\\(.\\)" "\\1" filename t))))
3076(make-obsolete 'comint-unquote-filename nil "24.2") 3076(make-obsolete 'comint-unquote-filename nil "24.3")
3077 3077
3078(defun comint--requote-argument (upos qstr) 3078(defun comint--requote-argument (upos qstr)
3079 ;; See `completion-table-with-quoting'. 3079 ;; See `completion-table-with-quoting'.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0ee2ea4a8bf..86a19131569 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1541,7 +1541,7 @@ that option."
1541This button will have a menu with all three reset operations." 1541This button will have a menu with all three reset operations."
1542 :type 'boolean 1542 :type 'boolean
1543 :group 'custom-buffer 1543 :group 'custom-buffer
1544 :version "24.2") 1544 :version "24.3")
1545 1545
1546(defcustom custom-buffer-verbose-help t 1546(defcustom custom-buffer-verbose-help t
1547 "If non-nil, include explanatory text in the customization buffer." 1547 "If non-nil, include explanatory text in the customization buffer."
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5f7f5b3d31..0eb8b2d63c3 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -204,7 +204,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
204 (delete-by-moving-to-trash auto-save boolean "23.1") 204 (delete-by-moving-to-trash auto-save boolean "23.1")
205 (auto-save-visited-file-name auto-save boolean) 205 (auto-save-visited-file-name auto-save boolean)
206 ;; filelock.c 206 ;; filelock.c
207 (create-lockfiles files boolean "24.2") 207 (create-lockfiles files boolean "24.3")
208 (temporary-file-directory 208 (temporary-file-directory
209 ;; Darwin section added 24.1, does not seem worth :version bump. 209 ;; Darwin section added 24.1, does not seem worth :version bump.
210 files directory nil 210 files directory nil
diff --git a/lisp/custom.el b/lisp/custom.el
index edb7fe2eaad..fb166dd35f7 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -611,7 +611,7 @@ property, or (ii) an alias for another customizable variable."
611 (or (get variable 'standard-value) 611 (or (get variable 'standard-value)
612 (get variable 'custom-autoload)))) 612 (get variable 'custom-autoload))))
613 613
614(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.2") 614(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.3")
615 615
616(defun custom-note-var-changed (variable) 616(defun custom-note-var-changed (variable)
617 "Inform Custom that VARIABLE has been set (changed). 617 "Inform Custom that VARIABLE has been set (changed).
diff --git a/lisp/dired.el b/lisp/dired.el
index 3aa0088a699..6684be3356c 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3476,7 +3476,7 @@ The idea is to set this buffer-locally in special dired buffers.")
3476 (force-mode-line-update))) 3476 (force-mode-line-update)))
3477 3477
3478(define-obsolete-function-alias 'dired-sort-set-modeline 3478(define-obsolete-function-alias 'dired-sort-set-modeline
3479 'dired-sort-set-mode-line "24.2") 3479 'dired-sort-set-mode-line "24.3")
3480 3480
3481(defun dired-sort-toggle-or-edit (&optional arg) 3481(defun dired-sort-toggle-or-edit (&optional arg)
3482 "Toggle sorting by date, and refresh the Dired buffer. 3482 "Toggle sorting by date, and refresh the Dired buffer.
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index f71554e9f66..5d9ddc1a318 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -201,7 +201,7 @@ See the documentation of `electric-buffer-list' for details."
201 "return to buffer editing")) 201 "return to buffer editing"))
202 202
203(define-obsolete-function-alias 'Electric-buffer-menu-mode 203(define-obsolete-function-alias 'Electric-buffer-menu-mode
204 'electric-buffer-menu-mode "24.2") 204 'electric-buffer-menu-mode "24.3")
205 205
206;; generally the same as Buffer-menu-mode-map 206;; generally the same as Buffer-menu-mode-map
207;; (except we don't indirect to global-map) 207;; (except we don't indirect to global-map)
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 925d275386f..9b66c8ffd60 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -420,8 +420,8 @@ In interpreted code, this is entirely equivalent to `progn'."
420;; nil) 420;; nil)
421 421
422(make-obsolete-variable 'macro-declaration-function 422(make-obsolete-variable 'macro-declaration-function
423 'macro-declarations-alist "24.2") 423 'macro-declarations-alist "24.3")
424(make-obsolete 'macro-declaration-function 424(make-obsolete 'macro-declaration-function
425 'macro-declarations-alist "24.2") 425 'macro-declarations-alist "24.3")
426 426
427;;; byte-run.el ends here 427;;; byte-run.el ends here
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index aa12c709b1a..86497a3c73f 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -99,8 +99,8 @@
99;;;###autoload 99;;;###autoload
100(define-obsolete-variable-alias 100(define-obsolete-variable-alias
101 ;; This alias is needed for compatibility with .elc files that use defstruct 101 ;; This alias is needed for compatibility with .elc files that use defstruct
102 ;; and were compiled with Emacs<24.2. 102 ;; and were compiled with Emacs<24.3.
103 'custom-print-functions 'cl-custom-print-functions "24.2") 103 'custom-print-functions 'cl-custom-print-functions "24.3")
104 104
105;;;###autoload 105;;;###autoload
106(defvar cl-custom-print-functions nil 106(defvar cl-custom-print-functions nil
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index c9ed9efe0c5..ae0852d6c87 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -452,7 +452,7 @@ definitions, or lack thereof).
452 452
453\(fn ((FUNC ARGLIST BODY...) ...) FORM...)" 453\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
454 (declare (indent 1) (debug cl-flet) 454 (declare (indent 1) (debug cl-flet)
455 (obsolete "Use either `cl-flet' or `cl-letf'." "24.2")) 455 (obsolete "Use either `cl-flet' or `cl-letf'." "24.3"))
456 `(letf ,(mapcar 456 `(letf ,(mapcar
457 (lambda (x) 457 (lambda (x)
458 (if (or (and (fboundp (car x)) 458 (if (or (and (fboundp (car x))
@@ -480,7 +480,7 @@ will not work - use `labels' instead" (symbol-name (car x))))
480 "Make temporary function bindings. 480 "Make temporary function bindings.
481Like `cl-labels' except that the lexical scoping is handled via `lexical-let' 481Like `cl-labels' except that the lexical scoping is handled via `lexical-let'
482rather than relying on `lexical-binding'." 482rather than relying on `lexical-binding'."
483 (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.2")) 483 (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.3"))
484 (let ((vars nil) (sets nil) (newenv macroexpand-all-environment)) 484 (let ((vars nil) (sets nil) (newenv macroexpand-all-environment))
485 (dolist (binding bindings) 485 (dolist (binding bindings)
486 ;; It's important that (not (eq (symbol-name var1) (symbol-name var2))) 486 ;; It's important that (not (eq (symbol-name var1) (symbol-name var2)))
@@ -521,7 +521,7 @@ Like `cl-letf', but with some extra backward compatibility."
521 521
522(defun cl--gv-adapt (cl-gv do) 522(defun cl--gv-adapt (cl-gv do)
523 ;; This function is used by all .elc files that use define-setf-expander and 523 ;; This function is used by all .elc files that use define-setf-expander and
524 ;; were compiled with Emacs>=24.2. 524 ;; were compiled with Emacs>=24.3.
525 (let ((vars (nth 0 cl-gv)) 525 (let ((vars (nth 0 cl-gv))
526 (vals (nth 1 cl-gv)) 526 (vals (nth 1 cl-gv))
527 (binds ()) 527 (binds ())
@@ -632,7 +632,7 @@ Example:
632;; `(,witness ,getter ,(funcall setter witness))))) 632;; `(,witness ,getter ,(funcall setter witness)))))
633;; ...find "let prefix" of expansion, extract getter and setter from 633;; ...find "let prefix" of expansion, extract getter and setter from
634;; ...the rest, and build the 5-tuple)) 634;; ...the rest, and build the 5-tuple))
635(make-obsolete 'get-setf-method 'gv-letplace "24.2") 635(make-obsolete 'get-setf-method 'gv-letplace "24.3")
636 636
637(defmacro define-modify-macro (name arglist func &optional doc) 637(defmacro define-modify-macro (name arglist func &optional doc)
638 "Define a `setf'-like modify macro. 638 "Define a `setf'-like modify macro.
@@ -653,52 +653,52 @@ from ARGLIST using FUNC: (define-modify-macro incf (&optional (n 1)) +)"
653;;; Additional compatibility code. 653;;; Additional compatibility code.
654;; For names that were clean but really aren't needed any more. 654;; For names that were clean but really aren't needed any more.
655 655
656(define-obsolete-function-alias 'cl-macroexpand 'macroexpand "24.2") 656(define-obsolete-function-alias 'cl-macroexpand 'macroexpand "24.3")
657(define-obsolete-variable-alias 'cl-macro-environment 657(define-obsolete-variable-alias 'cl-macro-environment
658 'macroexpand-all-environment "24.2") 658 'macroexpand-all-environment "24.3")
659(define-obsolete-function-alias 'cl-macroexpand-all 'macroexpand-all "24.2") 659(define-obsolete-function-alias 'cl-macroexpand-all 'macroexpand-all "24.3")
660 660
661;;; Hash tables. 661;;; Hash tables.
662;; This is just kept for compatibility with code byte-compiled by Emacs-20. 662;; This is just kept for compatibility with code byte-compiled by Emacs-20.
663 663
664;; No idea if this might still be needed. 664;; No idea if this might still be needed.
665(defun cl-not-hash-table (x &optional y &rest _z) 665(defun cl-not-hash-table (x &optional y &rest _z)
666 (declare (obsolete nil "24.2")) 666 (declare (obsolete nil "24.3"))
667 (signal 'wrong-type-argument (list 'cl-hash-table-p (or y x)))) 667 (signal 'wrong-type-argument (list 'cl-hash-table-p (or y x))))
668 668
669(defvar cl-builtin-gethash (symbol-function 'gethash)) 669(defvar cl-builtin-gethash (symbol-function 'gethash))
670(make-obsolete-variable 'cl-builtin-gethash nil "24.2") 670(make-obsolete-variable 'cl-builtin-gethash nil "24.3")
671(defvar cl-builtin-remhash (symbol-function 'remhash)) 671(defvar cl-builtin-remhash (symbol-function 'remhash))
672(make-obsolete-variable 'cl-builtin-remhash nil "24.2") 672(make-obsolete-variable 'cl-builtin-remhash nil "24.3")
673(defvar cl-builtin-clrhash (symbol-function 'clrhash)) 673(defvar cl-builtin-clrhash (symbol-function 'clrhash))
674(make-obsolete-variable 'cl-builtin-clrhash nil "24.2") 674(make-obsolete-variable 'cl-builtin-clrhash nil "24.3")
675(defvar cl-builtin-maphash (symbol-function 'maphash)) 675(defvar cl-builtin-maphash (symbol-function 'maphash))
676 676
677(make-obsolete-variable 'cl-builtin-maphash nil "24.2") 677(make-obsolete-variable 'cl-builtin-maphash nil "24.3")
678(define-obsolete-function-alias 'cl-map-keymap 'map-keymap "24.2") 678(define-obsolete-function-alias 'cl-map-keymap 'map-keymap "24.3")
679(define-obsolete-function-alias 'cl-copy-tree 'copy-tree "24.2") 679(define-obsolete-function-alias 'cl-copy-tree 'copy-tree "24.3")
680(define-obsolete-function-alias 'cl-gethash 'gethash "24.2") 680(define-obsolete-function-alias 'cl-gethash 'gethash "24.3")
681(define-obsolete-function-alias 'cl-puthash 'puthash "24.2") 681(define-obsolete-function-alias 'cl-puthash 'puthash "24.3")
682(define-obsolete-function-alias 'cl-remhash 'remhash "24.2") 682(define-obsolete-function-alias 'cl-remhash 'remhash "24.3")
683(define-obsolete-function-alias 'cl-clrhash 'clrhash "24.2") 683(define-obsolete-function-alias 'cl-clrhash 'clrhash "24.3")
684(define-obsolete-function-alias 'cl-maphash 'maphash "24.2") 684(define-obsolete-function-alias 'cl-maphash 'maphash "24.3")
685(define-obsolete-function-alias 'cl-make-hash-table 'make-hash-table "24.2") 685(define-obsolete-function-alias 'cl-make-hash-table 'make-hash-table "24.3")
686(define-obsolete-function-alias 'cl-hash-table-p 'hash-table-p "24.2") 686(define-obsolete-function-alias 'cl-hash-table-p 'hash-table-p "24.3")
687(define-obsolete-function-alias 'cl-hash-table-count 'hash-table-count "24.2") 687(define-obsolete-function-alias 'cl-hash-table-count 'hash-table-count "24.3")
688 688
689(define-obsolete-function-alias 'cl-map-keymap-recursively 689(define-obsolete-function-alias 'cl-map-keymap-recursively
690 'cl--map-keymap-recursively "24.2") 690 'cl--map-keymap-recursively "24.3")
691(define-obsolete-function-alias 'cl-map-intervals 'cl--map-intervals "24.2") 691(define-obsolete-function-alias 'cl-map-intervals 'cl--map-intervals "24.3")
692(define-obsolete-function-alias 'cl-map-extents 'cl--map-overlays "24.2") 692(define-obsolete-function-alias 'cl-map-extents 'cl--map-overlays "24.3")
693 693
694(defun cl-maclisp-member (item list) 694(defun cl-maclisp-member (item list)
695 (declare (obsolete member "24.2")) 695 (declare (obsolete member "24.3"))
696 (while (and list (not (equal item (car list)))) (setq list (cdr list))) 696 (while (and list (not (equal item (car list)))) (setq list (cdr list)))
697 list) 697 list)
698 698
699;; Used in the expansion of the old `defstruct'. 699;; Used in the expansion of the old `defstruct'.
700(defun cl-struct-setf-expander (x name accessor pred-form pos) 700(defun cl-struct-setf-expander (x name accessor pred-form pos)
701 (declare (obsolete nil "24.2")) 701 (declare (obsolete nil "24.3"))
702 (let* ((temp (make-symbol "--cl-x--")) (store (make-symbol "--cl-store--"))) 702 (let* ((temp (make-symbol "--cl-x--")) (store (make-symbol "--cl-store--")))
703 (list (list temp) (list x) (list store) 703 (list (list temp) (list x) (list store)
704 `(progn 704 `(progn
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 910d9403753..7fcd339d6d2 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3742,7 +3742,7 @@ By default, loading the `edebug' library causes these bindings to
3742be installed in `emacs-lisp-mode-map'.") 3742be installed in `emacs-lisp-mode-map'.")
3743 3743
3744(define-obsolete-variable-alias 'gud-inhibit-global-bindings 3744(define-obsolete-variable-alias 'gud-inhibit-global-bindings
3745 'edebug-inhibit-emacs-lisp-mode-bindings "24.2") 3745 'edebug-inhibit-emacs-lisp-mode-bindings "24.3")
3746 3746
3747;; Global GUD bindings for all emacs-lisp-mode buffers. 3747;; Global GUD bindings for all emacs-lisp-mode buffers.
3748(unless edebug-inhibit-emacs-lisp-mode-bindings 3748(unless edebug-inhibit-emacs-lisp-mode-bindings
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 5f4be78b082..9304f0e3918 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -2554,7 +2554,7 @@ This is usually a symbol that starts with `:'."
2554(defsetf eieio-oref eieio-oset) 2554(defsetf eieio-oref eieio-oset)
2555 2555
2556(if (eval-when-compile (fboundp 'gv-define-expander)) 2556(if (eval-when-compile (fboundp 'gv-define-expander))
2557 ;; Not needed for Emacs>=24.2 since gv.el's setf expands macros and 2557 ;; Not needed for Emacs>=24.3 since gv.el's setf expands macros and
2558 ;; follows aliases. 2558 ;; follows aliases.
2559 nil 2559 nil
2560(defsetf slot-value eieio-oset) 2560(defsetf slot-value eieio-oset)
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 6d91238f2b1..5343d499efb 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -86,7 +86,7 @@ for both actions (NOT RECOMMENDED)."
86The functions get one argument, the first locked buffer found." 86The functions get one argument, the first locked buffer found."
87 :type 'hook 87 :type 'hook
88 :group 'emacs-lock 88 :group 'emacs-lock
89 :version "24.2") 89 :version "24.3")
90 90
91(defvar emacs-lock-mode nil 91(defvar emacs-lock-mode nil
92 "If non-nil, the current buffer is locked. 92 "If non-nil, the current buffer is locked.
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index d29736d6860..c9822b7ec27 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -177,7 +177,7 @@ nice to the world.")
177 :group 'crisp) 177 :group 'crisp)
178 178
179(define-obsolete-variable-alias 'crisp-mode-modeline-string 179(define-obsolete-variable-alias 'crisp-mode-modeline-string
180 'crisp-mode-mode-line-string "24.2") 180 'crisp-mode-mode-line-string "24.3")
181 181
182;;;###autoload 182;;;###autoload
183(defcustom crisp-mode nil 183(defcustom crisp-mode nil
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index cce24e67cf4..5da3009c854 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -396,7 +396,7 @@ isn't displayed."
396(defcustom erc-server-timestamp-format "%Y-%m-%d %T" 396(defcustom erc-server-timestamp-format "%Y-%m-%d %T"
397 "Timestamp format used with server response messages. 397 "Timestamp format used with server response messages.
398This string is processed using `format-time-string'." 398This string is processed using `format-time-string'."
399 :version "24.2" 399 :version "24.3"
400 :type 'string 400 :type 'string
401 :group 'erc-server) 401 :group 'erc-server)
402 402
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 66256ee270e..4d0534d3d5e 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1105,7 +1105,7 @@ Each function is called with two arguments: the ERC process and
1105the unprocessed output.") 1105the unprocessed output.")
1106 1106
1107(define-obsolete-variable-alias 'erc-dcc-chat-filter-hook 1107(define-obsolete-variable-alias 'erc-dcc-chat-filter-hook
1108 'erc-dcc-chat-filter-functions "24.2") 1108 'erc-dcc-chat-filter-functions "24.3")
1109 1109
1110(defvar erc-dcc-chat-mode-map 1110(defvar erc-dcc-chat-mode-map
1111 (let ((map (make-sparse-keymap))) 1111 (let ((map (make-sparse-keymap)))
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 259eb201fe0..8daf9be2b14 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -237,7 +237,7 @@ current-nick, keyword, pal, dangerous-host, fool"
237useful for excluding all the things like MOTDs from the server 237useful for excluding all the things like MOTDs from the server
238and other miscellaneous functions." 238and other miscellaneous functions."
239 :group 'erc-match 239 :group 'erc-match
240 :version "24.2" 240 :version "24.3"
241 :type 'boolean) 241 :type 'boolean)
242 242
243;; Internal variables: 243;; Internal variables:
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 9da3f8e2e79..8a9107e5470 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -199,7 +199,7 @@ This is used by `eshell-watch-for-password-prompt'."
199 :group 'eshell-mode) 199 :group 'eshell-mode)
200 200
201(define-obsolete-variable-alias 'eshell-status-in-modeline 201(define-obsolete-variable-alias 'eshell-status-in-modeline
202 'eshell-status-in-mode-line "24.2") 202 'eshell-status-in-mode-line "24.3")
203 203
204(defvar eshell-first-time-p t 204(defvar eshell-first-time-p t
205 "A variable which is non-nil the first time Eshell is loaded.") 205 "A variable which is non-nil the first time Eshell is loaded.")
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 2d5dc2acf05..c663de3f40d 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -245,14 +245,14 @@ shells such as bash, zsh, rc, 4dos."
245 "Add `eshell-buffer-name' to `same-window-buffer-names'." 245 "Add `eshell-buffer-name' to `same-window-buffer-names'."
246 (add-to-list 'same-window-buffer-names eshell-buffer-name)) 246 (add-to-list 'same-window-buffer-names eshell-buffer-name))
247(make-obsolete 'eshell-add-to-window-buffer-names 247(make-obsolete 'eshell-add-to-window-buffer-names
248 "no longer needed." "24.2") 248 "no longer needed." "24.3")
249 249
250(defun eshell-remove-from-window-buffer-names () 250(defun eshell-remove-from-window-buffer-names ()
251 "Remove `eshell-buffer-name' from `same-window-buffer-names'." 251 "Remove `eshell-buffer-name' from `same-window-buffer-names'."
252 (setq same-window-buffer-names 252 (setq same-window-buffer-names
253 (delete eshell-buffer-name same-window-buffer-names))) 253 (delete eshell-buffer-name same-window-buffer-names)))
254(make-obsolete 'eshell-remove-from-window-buffer-names 254(make-obsolete 'eshell-remove-from-window-buffer-names
255 "no longer needed." "24.2") 255 "no longer needed." "24.3")
256 256
257(defcustom eshell-load-hook nil 257(defcustom eshell-load-hook nil
258 "A hook run once Eshell has been loaded." 258 "A hook run once Eshell has been loaded."
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 3d1f402ab6c..d0f3b639cf2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -160,7 +160,7 @@ If the value is a list of strings, that specifies a list of URL
160schemes (e.g. \"ftp\"); in that case, only convert those URLs." 160schemes (e.g. \"ftp\"); in that case, only convert those URLs."
161 :type '(choice (repeat string) boolean) 161 :type '(choice (repeat string) boolean)
162 :group 'ffap 162 :group 'ffap
163 :version "24.2") 163 :version "24.3")
164 164
165(defcustom ffap-ftp-default-user "anonymous" 165(defcustom ffap-ftp-default-user "anonymous"
166 "User name in ftp file names generated by `ffap-host-to-path'. 166 "User name in ftp file names generated by `ffap-host-to-path'.
diff --git a/lisp/files.el b/lisp/files.el
index bec494b80a2..5caa4681884 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1000,7 +1000,7 @@ Tip: You can use this expansion of remote identifier components
1000 (setq list (cdr list)))) 1000 (setq list (cdr list))))
1001 (or (car list) "ssh"))) 1001 (or (car list) "ssh")))
1002 "Program to use to execute commands on a remote host (e.g. ssh or rsh)." 1002 "Program to use to execute commands on a remote host (e.g. ssh or rsh)."
1003 :version "24.2" ; ssh rather than rsh, etc 1003 :version "24.3" ; ssh rather than rsh, etc
1004 :initialize 'custom-initialize-delay 1004 :initialize 'custom-initialize-delay
1005 :group 'environment 1005 :group 'environment
1006 :type 'file) 1006 :type 'file)
@@ -1621,7 +1621,7 @@ Choose the buffer's name using `generate-new-buffer-name'."
1621 "Regexp to match the automounter prefix in a directory name." 1621 "Regexp to match the automounter prefix in a directory name."
1622 :group 'files 1622 :group 'files
1623 :type 'regexp) 1623 :type 'regexp)
1624(make-obsolete-variable 'automount-dir-prefix 'directory-abbrev-alist "24.2") 1624(make-obsolete-variable 'automount-dir-prefix 'directory-abbrev-alist "24.3")
1625 1625
1626(defvar abbreviated-home-dir nil 1626(defvar abbreviated-home-dir nil
1627 "The user's homedir abbreviated according to `directory-abbrev-alist'.") 1627 "The user's homedir abbreviated according to `directory-abbrev-alist'.")
@@ -3640,7 +3640,7 @@ is found. Returns the new class name."
3640 3640
3641(defcustom enable-remote-dir-locals nil 3641(defcustom enable-remote-dir-locals nil
3642 "Non-nil means dir-local variables will be applied to remote files." 3642 "Non-nil means dir-local variables will be applied to remote files."
3643 :version "24.2" 3643 :version "24.3"
3644 :type 'boolean 3644 :type 'boolean
3645 :group 'find-file) 3645 :group 'find-file)
3646 3646
diff --git a/lisp/frame.el b/lisp/frame.el
index e905e66a5f9..01225639ecf 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1651,7 +1651,7 @@ terminals, cursor blinking is controlled by the terminal."
1651 1651
1652;; Misc. 1652;; Misc.
1653 1653
1654;; Only marked as obsolete in 24.2. 1654;; Only marked as obsolete in 24.3.
1655(define-obsolete-variable-alias 'automatic-hscrolling 1655(define-obsolete-variable-alias 'automatic-hscrolling
1656 'auto-hscroll-mode "22.1") 1656 'auto-hscroll-mode "22.1")
1657 1657
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index bcd2cd438e9..594f68bb86f 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -174,7 +174,7 @@ specifies a group to which resent messages will be Gcc'd. If this is
174nil, Gcc will be done according to existing Gcc header(s), if any. 174nil, Gcc will be done according to existing Gcc header(s), if any.
175If this is `no-gcc-self', resent messages will be Gcc'd to groups that 175If this is `no-gcc-self', resent messages will be Gcc'd to groups that
176existing Gcc header specifies, except for the current group." 176existing Gcc header specifies, except for the current group."
177 :version "24.2" 177 :version "24.3"
178 :group 'gnus-message 178 :group 'gnus-message
179 :type '(choice (const none) (const t) string (const nil) 179 :type '(choice (const none) (const t) string (const nil)
180 (const no-gcc-self))) 180 (const no-gcc-self)))
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 3b335b335dd..44f56b5acf3 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -78,7 +78,7 @@ Some people may want to add \"unknown\" to this list."
78(defcustom gnus-picon-properties '(:color-symbols (("None" . "white"))) 78(defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
79 "List of image properties applied to picons." 79 "List of image properties applied to picons."
80 :type 'list 80 :type 'list
81 :version "24.2" 81 :version "24.3"
82 :group 'gnus-picon) 82 :group 'gnus-picon)
83 83
84(defcustom gnus-picon-style 'inline 84(defcustom gnus-picon-style 'inline
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 939d56bbfd8..8fd89b1742c 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1336,7 +1336,7 @@ If nil, you might be asked to input the charset."
1336 "*Addresses to prune when doing wide replies. 1336 "*Addresses to prune when doing wide replies.
1337This can be a regexp or a list of regexps. Also, a value of nil means 1337This can be a regexp or a list of regexps. Also, a value of nil means
1338exclude your own user name only." 1338exclude your own user name only."
1339 :version "24.2" 1339 :version "24.3"
1340 :group 'message 1340 :group 'message
1341 :link '(custom-manual "(message)Wide Reply") 1341 :link '(custom-manual "(message)Wide Reply")
1342 :type '(choice (const :tag "Yourself" nil) 1342 :type '(choice (const :tag "Yourself" nil)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 1645f49091f..93f04cda929 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -559,7 +559,7 @@ parameter. It should return nil, `warn' or `delete'."
559 "Extra headers to parse. 559 "Extra headers to parse.
560In addition to the standard headers, these extra headers will be 560In addition to the standard headers, these extra headers will be
561included in NOV headers (and the like) when backends parse headers." 561included in NOV headers (and the like) when backends parse headers."
562 :version "24.2" 562 :version "24.3"
563 :group 'nnmail 563 :group 'nnmail
564 :type '(repeat symbol)) 564 :type '(repeat symbol))
565 565
diff --git a/lisp/help.el b/lisp/help.el
index c02b058fef9..19cb811bcf5 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1038,7 +1038,7 @@ construct (see `substitute-command-keys'), the library is loaded,
1038so that the documentation can show the right key bindings." 1038so that the documentation can show the right key bindings."
1039 :type 'boolean 1039 :type 'boolean
1040 :group 'help 1040 :group 'help
1041 :version "24.2") 1041 :version "24.3")
1042 1042
1043(defun help-window-display-message (quit-part window &optional scroll) 1043(defun help-window-display-message (quit-part window &optional scroll)
1044 "Display message telling how to quit and scroll help window. 1044 "Display message telling how to quit and scroll help window.
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 75094cd33b8..7dd39807955 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -58,7 +58,7 @@
58 (const 32) 58 (const 32)
59 (const 64)) 59 (const 64))
60 :group 'hexl 60 :group 'hexl
61 :version "24.2") 61 :version "24.3")
62 62
63(defcustom hexl-program "hexl" 63(defcustom hexl-program "hexl"
64 "The program that will hexlify and dehexlify its stdin. 64 "The program that will hexlify and dehexlify its stdin.
diff --git a/lisp/image.el b/lisp/image.el
index f5a2de5e595..7801923c3fe 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -774,7 +774,7 @@ has no effect."
774 :set (lambda (symbol value) 774 :set (lambda (symbol value)
775 (set-default symbol value) 775 (set-default symbol value)
776 (imagemagick-register-types)) 776 (imagemagick-register-types))
777 :version "24.2" 777 :version "24.3"
778 :group 'image) 778 :group 'image)
779 779
780(defcustom imagemagick-enabled-types 780(defcustom imagemagick-enabled-types
@@ -812,7 +812,7 @@ has no effect."
812 :set (lambda (symbol value) 812 :set (lambda (symbol value)
813 (set-default symbol value) 813 (set-default symbol value)
814 (imagemagick-register-types)) 814 (imagemagick-register-types))
815 :version "24.2" 815 :version "24.3"
816 :group 'image) 816 :group 'image)
817 817
818(imagemagick-register-types) 818(imagemagick-register-types)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 30dc88a21f5..2fc9759972e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1333,7 +1333,7 @@ of `history-length', which see.")
1333 1333
1334(define-obsolete-variable-alias 1334(define-obsolete-variable-alias
1335 'inactivate-current-input-method-function 1335 'inactivate-current-input-method-function
1336 'deactivate-current-input-method-function "24.2") 1336 'deactivate-current-input-method-function "24.3")
1337(defvar deactivate-current-input-method-function nil 1337(defvar deactivate-current-input-method-function nil
1338 "Function to call for deactivating the current input method. 1338 "Function to call for deactivating the current input method.
1339Every input method should set this to an appropriate value when activated. 1339Every input method should set this to an appropriate value when activated.
@@ -1473,7 +1473,7 @@ If INPUT-METHOD is nil, deactivate any current input method."
1473 1473
1474(define-obsolete-function-alias 1474(define-obsolete-function-alias
1475 'inactivate-input-method 1475 'inactivate-input-method
1476 'deactivate-input-method "24.2") 1476 'deactivate-input-method "24.3")
1477 1477
1478(defun set-input-method (input-method &optional interactive) 1478(defun set-input-method (input-method &optional interactive)
1479 "Select and activate input method INPUT-METHOD for the current buffer. 1479 "Select and activate input method INPUT-METHOD for the current buffer.
@@ -1651,7 +1651,7 @@ just activated."
1651 1651
1652(define-obsolete-variable-alias 1652(define-obsolete-variable-alias
1653 'input-method-inactivate-hook 1653 'input-method-inactivate-hook
1654 'input-method-deactivate-hook "24.2") 1654 'input-method-deactivate-hook "24.3")
1655 1655
1656(defcustom input-method-deactivate-hook nil 1656(defcustom input-method-deactivate-hook nil
1657 "Normal hook run just after an input method is deactivated. 1657 "Normal hook run just after an input method is deactivated.
@@ -1660,7 +1660,7 @@ The variable `current-input-method' still keeps the input method name
1660just deactivated." 1660just deactivated."
1661 :type 'hook 1661 :type 'hook
1662 :group 'mule 1662 :group 'mule
1663 :version "24.2") 1663 :version "24.3")
1664 1664
1665(defcustom input-method-after-insert-chunk-hook nil 1665(defcustom input-method-after-insert-chunk-hook nil
1666 "Normal hook run just after an input method insert some chunk of text." 1666 "Normal hook run just after an input method insert some chunk of text."
@@ -2959,7 +2959,7 @@ point or a number in hash notation, e.g. #o21430 for octal,
2959 (t 2959 (t
2960 (cdr (assoc-string input (ucs-names) t)))))) 2960 (cdr (assoc-string input (ucs-names) t))))))
2961 2961
2962(define-obsolete-function-alias 'ucs-insert 'insert-char "24.2") 2962(define-obsolete-function-alias 'ucs-insert 'insert-char "24.3")
2963(define-key ctl-x-map "8\r" 'insert-char) 2963(define-key ctl-x-map "8\r" 'insert-char)
2964 2964
2965;;; mule-cmds.el ends here 2965;;; mule-cmds.el ends here
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 65ef807c238..4669528c9a7 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -547,7 +547,7 @@ This function runs the normal hook `quail-deactivate-hook'."
547 (interactive) 547 (interactive)
548 (quail-activate -1)) 548 (quail-activate -1))
549 549
550(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "24.2") 550(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "24.3")
551 551
552(defun quail-activate (&optional arg) 552(defun quail-activate (&optional arg)
553 "Activate Quail input method. 553 "Activate Quail input method.
@@ -595,7 +595,7 @@ While this input method is active, the variable
595 595
596(define-obsolete-variable-alias 596(define-obsolete-variable-alias
597 'quail-inactivate-hook 597 'quail-inactivate-hook
598 'quail-deactivate-hook "24.2") 598 'quail-deactivate-hook "24.3")
599 599
600(defun quail-exit-from-minibuffer () 600(defun quail-exit-from-minibuffer ()
601 (deactivate-input-method) 601 (deactivate-input-method)
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index fee4c330e6e..897075f0faf 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -396,7 +396,7 @@ A nil value means no package is selected.")
396 (interactive) 396 (interactive)
397 (robin-activate -1)) 397 (robin-activate -1))
398 398
399(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.2") 399(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.3")
400 400
401(defun robin-activate (&optional arg) 401(defun robin-activate (&optional arg)
402 "Activate robin input method. 402 "Activate robin input method.
@@ -431,7 +431,7 @@ While this input method is active, the variable
431 431
432(define-obsolete-variable-alias 432(define-obsolete-variable-alias
433 'robin-inactivate-hook 433 'robin-inactivate-hook
434 'robin-deactivate-hook "24.2") 434 'robin-deactivate-hook "24.3")
435 435
436(defun robin-exit-from-minibuffer () 436(defun robin-exit-from-minibuffer ()
437 (deactivate-input-method) 437 (deactivate-input-method)
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 4afd974f49c..8b7a0ab3e6f 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -4133,7 +4133,7 @@ For example, the function `case' has an indent property
4133;;;;;; 653810 0)) 4133;;;;;; 653810 0))
4134;;; Generated autoloads from emacs-lisp/cl-lib.el 4134;;; Generated autoloads from emacs-lisp/cl-lib.el
4135 4135
4136(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.2") 4136(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3")
4137 4137
4138(defvar cl-custom-print-functions nil "\ 4138(defvar cl-custom-print-functions nil "\
4139This is a list of functions that format user objects for printing. 4139This is a list of functions that format user objects for printing.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8cc72e1afba..6ee3c7898c5 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -355,7 +355,7 @@ usually do not have translators for other languages.\n\n")))
355 (buffer-substring-no-properties (point-min) (point))) 355 (buffer-substring-no-properties (point-min) (point)))
356 (goto-char user-point))) 356 (goto-char user-point)))
357 357
358(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.2") 358(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.3")
359 359
360;; It's the default mail mode, so it seems OK to use its features. 360;; It's the default mail mode, so it seems OK to use its features.
361(autoload 'message-bogus-recipient-p "message") 361(autoload 'message-bogus-recipient-p "message")
diff --git a/lisp/man.el b/lisp/man.el
index 36f8061d18f..198cdbafab5 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -129,19 +129,19 @@ the manpage buffer."
129 '((t (:inherit bold))) 129 '((t (:inherit bold)))
130 "Face to use when fontifying overstrike." 130 "Face to use when fontifying overstrike."
131 :group 'man 131 :group 'man
132 :version "24.2") 132 :version "24.3")
133 133
134(defface Man-underline 134(defface Man-underline
135 '((t (:inherit underline))) 135 '((t (:inherit underline)))
136 "Face to use when fontifying underlining." 136 "Face to use when fontifying underlining."
137 :group 'man 137 :group 'man
138 :version "24.2") 138 :version "24.3")
139 139
140(defface Man-reverse 140(defface Man-reverse
141 '((t (:inherit highlight))) 141 '((t (:inherit highlight)))
142 "Face to use when fontifying reverse video." 142 "Face to use when fontifying reverse video."
143 :group 'man 143 :group 'man
144 :version "24.2") 144 :version "24.3")
145 145
146(defvar Man-ansi-color-map (let ((ansi-color-faces-vector 146(defvar Man-ansi-color-map (let ((ansi-color-faces-vector
147 [ default Man-overstrike default Man-underline 147 [ default Man-overstrike default Man-underline
diff --git a/lisp/mpc.el b/lisp/mpc.el
index f1dbb3803b6..e8b5c50e561 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -184,7 +184,7 @@ numerically rather than lexicographically."
184 (abs res)) 184 (abs res))
185 res)))))))) 185 res))))))))
186 186
187(define-obsolete-function-alias 'mpc-string-prefix-p 'string-prefix-p "24.2") 187(define-obsolete-function-alias 'mpc-string-prefix-p 'string-prefix-p "24.3")
188 188
189;; This can speed up mpc--song-search significantly. The table may grow 189;; This can speed up mpc--song-search significantly. The table may grow
190;; very large, tho. It's only bounded by the fact that it gets flushed 190;; very large, tho. It's only bounded by the fact that it gets flushed
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index d0200f4cb9d..772a0a9c626 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -280,7 +280,7 @@ object is returned instead of a list containing this single Lisp object.
280 280
281;; `dbus-call-method' works non-blocking now. 281;; `dbus-call-method' works non-blocking now.
282(defalias 'dbus-call-method-non-blocking 'dbus-call-method) 282(defalias 'dbus-call-method-non-blocking 'dbus-call-method)
283(make-obsolete 'dbus-call-method-non-blocking 'dbus-call-method "24.2") 283(make-obsolete 'dbus-call-method-non-blocking 'dbus-call-method "24.3")
284 284
285(defun dbus-call-method-asynchronously 285(defun dbus-call-method-asynchronously
286 (bus service path interface method handler &rest args) 286 (bus service path interface method handler &rest args)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 85a13a8cf62..27cf50f06ca 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -365,7 +365,7 @@ of a line. The string is passed as the first argument to
365 "When non-nil, kill channel buffers when the server buffer is killed. 365 "When non-nil, kill channel buffers when the server buffer is killed.
366Only the channel buffers associated with the server in question 366Only the channel buffers associated with the server in question
367will be killed." 367will be killed."
368 :version "24.2" 368 :version "24.3"
369 :type 'boolean 369 :type 'boolean
370 :group 'rcirc) 370 :group 'rcirc)
371 371
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 1ea2719a23f..f1d54b6fd3c 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -249,21 +249,21 @@ If it isn't found in the local $PATH, the absolute path of winexe
249shall be given. This is needed for remote processes." 249shall be given. This is needed for remote processes."
250 :group 'tramp 250 :group 'tramp
251 :type 'string 251 :type 'string
252 :version "24.2") 252 :version "24.3")
253 253
254(defcustom tramp-smb-winexe-shell-command "powershell.exe" 254(defcustom tramp-smb-winexe-shell-command "powershell.exe"
255 "Shell to be used for processes on remote machines. 255 "Shell to be used for processes on remote machines.
256This must be Powershell V2 compatible." 256This must be Powershell V2 compatible."
257 :group 'tramp 257 :group 'tramp
258 :type 'string 258 :type 'string
259 :version "24.2") 259 :version "24.3")
260 260
261(defcustom tramp-smb-winexe-shell-command-switch "-file -" 261(defcustom tramp-smb-winexe-shell-command-switch "-file -"
262 "Command switch used together with `tramp-smb-winexe-shell-command'. 262 "Command switch used together with `tramp-smb-winexe-shell-command'.
263This can be used to disable echo etc." 263This can be used to disable echo etc."
264 :group 'tramp 264 :group 'tramp
265 :type 'string 265 :type 'string
266 :version "24.2") 266 :version "24.3")
267 267
268;;;###tramp-autoload 268;;;###tramp-autoload
269(defsubst tramp-smb-file-name-p (filename) 269(defsubst tramp-smb-file-name-p (filename)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 58506ce82f7..848599104c5 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -413,7 +413,7 @@ This is a list of regular expressions, which denote hosts running
413a registered shell like \"rbash\". Those hosts can be used as 413a registered shell like \"rbash\". Those hosts can be used as
414proxies only, see `tramp-default-proxies-alist'. If the local 414proxies only, see `tramp-default-proxies-alist'. If the local
415host runs a registered shell, it shall be added to this list, too." 415host runs a registered shell, it shall be added to this list, too."
416 :version "24.2" 416 :version "24.3"
417 :group 'tramp 417 :group 'tramp
418 :type '(repeat (regexp :tag "Host regexp"))) 418 :type '(repeat (regexp :tag "Host regexp")))
419 419
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 5c8829ff72e..a7fedf20f53 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -283,7 +283,7 @@ Python's PEP8 for example recommends two spaces, so you could do:
283 (lambda () (set (make-local-variable 'comment-inline-offset) 2))) 283 (lambda () (set (make-local-variable 'comment-inline-offset) 2)))
284 284
285See `comment-padding' for whole-line comments." 285See `comment-padding' for whole-line comments."
286 :version "24.2" 286 :version "24.3"
287 :type 'integer 287 :type 'integer
288 :group 'comment) 288 :group 'comment)
289 289
diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index 86b14e66398..4ac9764af08 100644
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -346,7 +346,7 @@ The constants `nxml-ascii-glyph-set', `nxml-latin1-glyph-set',
346predefined for use by `nxml-glyph-set-functions'.") 346predefined for use by `nxml-glyph-set-functions'.")
347 347
348(define-obsolete-variable-alias 'nxml-glyph-set-hook 348(define-obsolete-variable-alias 'nxml-glyph-set-hook
349 'nxml-glyph-set-functions "24.2") 349 'nxml-glyph-set-functions "24.3")
350 350
351(defvar nxml-glyph-set nil 351(defvar nxml-glyph-set nil
352 "Used by `nxml-glyph-set-functions' to return set of glyphs in a FACE. 352 "Used by `nxml-glyph-set-functions' to return set of glyphs in a FACE.
diff --git a/lisp/obsolete/assoc.el b/lisp/obsolete/assoc.el
index d0738dfeb2c..5d213d193b3 100644
--- a/lisp/obsolete/assoc.el
+++ b/lisp/obsolete/assoc.el
@@ -4,7 +4,7 @@
4 4
5;; Author: Barry A. Warsaw <bwarsaw@cen.com> 5;; Author: Barry A. Warsaw <bwarsaw@cen.com>
6;; Keywords: extensions 6;; Keywords: extensions
7;; Obsolete-since: 24.2 7;; Obsolete-since: 24.3
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index 1dd69c129a0..bd7d9a6e6bf 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -6,7 +6,7 @@
6;; Maintainer: FSF 6;; Maintainer: FSF
7;; Keywords: games 7;; Keywords: games
8;; Created: Jan 1997 8;; Created: Jan 1997
9;; Obsolete-since: 24.2 9;; Obsolete-since: 24.3
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
diff --git a/lisp/obsolete/cust-print.el b/lisp/obsolete/cust-print.el
index 6be200d245c..fc00975ba37 100644
--- a/lisp/obsolete/cust-print.el
+++ b/lisp/obsolete/cust-print.el
@@ -5,7 +5,7 @@
5;; Author: Daniel LaLiberte <liberte@holonexus.org> 5;; Author: Daniel LaLiberte <liberte@holonexus.org>
6;; Adapted-By: ESR 6;; Adapted-By: ESR
7;; Keywords: extensions 7;; Keywords: extensions
8;; Obsolete-since: 24.2 8;; Obsolete-since: 24.3
9 9
10;; LCD Archive Entry: 10;; LCD Archive Entry:
11;; cust-print|Daniel LaLiberte|liberte@holonexus.org 11;; cust-print|Daniel LaLiberte|liberte@holonexus.org
diff --git a/lisp/obsolete/ledit.el b/lisp/obsolete/ledit.el
index 08e71aa5d2d..df6cb7b9db6 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -4,7 +4,7 @@
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6;; Keywords: languages 6;; Keywords: languages
7;; Obsolete-since: 24.2 7;; Obsolete-since: 24.3
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index 158523e8ef2..b6bf0d1e1b9 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -9,7 +9,7 @@
9;; Maintainer: FSF 9;; Maintainer: FSF
10;; Created: 13 Jan 1986 10;; Created: 13 Jan 1986
11;; Keywords: mail 11;; Keywords: mail
12;; Obsolete-since: 24.2 12;; Obsolete-since: 24.3
13 13
14;;; Commentary: 14;;; Commentary:
15 15
diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 45396d30ea5..8df4b3613ed 100644
--- a/lisp/obsolete/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -4,7 +4,7 @@
4 4
5;; Author: Mike Williams <mdub@bigfoot.com> 5;; Author: Mike Williams <mdub@bigfoot.com>
6;; Keywords: mouse 6;; Keywords: mouse
7;; Obsolete-since: 24.2 7;; Obsolete-since: 24.3
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -263,7 +263,7 @@ kill ring; mouse-1 or mouse-3 kills it."
263 interprogram-paste-function 263 interprogram-paste-function
264 mouse-sel-original-interprogram-paste-function)))) 264 mouse-sel-original-interprogram-paste-function))))
265 265
266(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.2") 266(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.3")
267 267
268;;=== Internal Variables/Constants ======================================== 268;;=== Internal Variables/Constants ========================================
269 269
diff --git a/lisp/obsolete/patcomp.el b/lisp/obsolete/patcomp.el
index b8304143e9f..9aacdd8f4c3 100644
--- a/lisp/obsolete/patcomp.el
+++ b/lisp/obsolete/patcomp.el
@@ -2,7 +2,7 @@
2 2
3;; This file is part of GNU Emacs. 3;; This file is part of GNU Emacs.
4 4
5;; Obsolete-since: 24.2 5;; Obsolete-since: 24.3
6 6
7;;; Commentary: 7;;; Commentary:
8 8
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index e637c3407f0..f2d1618f124 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -44,7 +44,7 @@
44 (push "--nosignature" opts)))) 44 (push "--nosignature" opts))))
45 opts) 45 opts)
46 "String, or list of strings, with extra options for an rpm query command." 46 "String, or list of strings, with extra options for an rpm query command."
47 :version "24.2" 47 :version "24.3"
48 :type '(choice (const :tag "No options" nil) 48 :type '(choice (const :tag "No options" nil)
49 (string :tag "Single option") 49 (string :tag "Single option")
50 (repeat :tag "List of options" string)) 50 (repeat :tag "List of options" string))
@@ -52,7 +52,7 @@
52 52
53(defcustom pcmpl-rpm-cache t 53(defcustom pcmpl-rpm-cache t
54 "Whether to cache the list of installed packages." 54 "Whether to cache the list of installed packages."
55 :version "24.2" 55 :version "24.3"
56 :type 'boolean 56 :type 'boolean
57 :group 'pcmpl-rpm) 57 :group 'pcmpl-rpm)
58 58
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index b71bfb202db..d357da685e5 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -165,7 +165,7 @@ A non-nil value is useful if `pcomplete-autolist' is non-nil too."
165 :group 'pcomplete) 165 :group 'pcomplete)
166 166
167(define-obsolete-variable-alias 167(define-obsolete-variable-alias
168 'pcomplete-arg-quote-list 'comint-file-name-quote-list "24.2") 168 'pcomplete-arg-quote-list 'comint-file-name-quote-list "24.3")
169 169
170(defcustom pcomplete-man-function 'man 170(defcustom pcomplete-man-function 'man
171 "A function to that will be called to display a manual page. 171 "A function to that will be called to display a manual page.
@@ -791,7 +791,7 @@ this is `comint-dynamic-complete-functions'."
791 pcomplete-args)))))) 791 pcomplete-args))))))
792 792
793(define-obsolete-function-alias 793(define-obsolete-function-alias
794 'pcomplete-quote-argument #'comint-quote-filename "24.2") 794 'pcomplete-quote-argument #'comint-quote-filename "24.3")
795 795
796;; file-system completion lists 796;; file-system completion lists
797 797
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index c008e1c4da3..21a323d8b45 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -684,13 +684,13 @@ starting the compilation process."
684 (t (:inverse-video t :weight bold))) 684 (t (:inverse-video t :weight bold)))
685 "Face for Compilation mode's \"error\" mode line indicator." 685 "Face for Compilation mode's \"error\" mode line indicator."
686 :group 'compilation 686 :group 'compilation
687 :version "24.2") 687 :version "24.3")
688 688
689(defface compilation-mode-line-run 689(defface compilation-mode-line-run
690 '((t :inherit compilation-warning)) 690 '((t :inherit compilation-warning))
691 "Face for Compilation mode's \"running\" mode line indicator." 691 "Face for Compilation mode's \"running\" mode line indicator."
692 :group 'compilation 692 :group 'compilation
693 :version "24.2") 693 :version "24.3")
694 694
695(defface compilation-mode-line-exit 695(defface compilation-mode-line-exit
696 '((default :inherit compilation-info) 696 '((default :inherit compilation-info)
@@ -700,7 +700,7 @@ starting the compilation process."
700 (t (:weight bold))) 700 (t (:weight bold)))
701 "Face for Compilation mode's \"exit\" mode line indicator." 701 "Face for Compilation mode's \"exit\" mode line indicator."
702 :group 'compilation 702 :group 'compilation
703 :version "24.2") 703 :version "24.3")
704 704
705(defface compilation-line-number 705(defface compilation-line-number
706 '((t :inherit font-lock-keyword-face)) 706 '((t :inherit font-lock-keyword-face))
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 848b92868e7..e13b67e596d 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -509,7 +509,7 @@ If nil, continued arguments are aligned with the first argument."
509 "Non-nil means that non-block ()-, {}- and []-groups are indented as blocks. 509 "Non-nil means that non-block ()-, {}- and []-groups are indented as blocks.
510The closing bracket is aligned with the line of the opening bracket, 510The closing bracket is aligned with the line of the opening bracket,
511not the contents of the brackets." 511not the contents of the brackets."
512 :version "24.2" 512 :version "24.3"
513 :type 'boolean 513 :type 'boolean
514 :group 'perl) 514 :group 'perl)
515 515
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 90908c80f1b..601850ed0fb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -378,14 +378,14 @@ The type returned can be `comment', `string' or `paren'."
378 (nth 8 (syntax-ppss))) 378 (nth 8 (syntax-ppss)))
379 379
380(define-obsolete-function-alias 380(define-obsolete-function-alias
381 'python-info-ppss-context #'python-syntax-context "24.2") 381 'python-info-ppss-context #'python-syntax-context "24.3")
382 382
383(define-obsolete-function-alias 383(define-obsolete-function-alias
384 'python-info-ppss-context-type #'python-syntax-context-type "24.2") 384 'python-info-ppss-context-type #'python-syntax-context-type "24.3")
385 385
386(define-obsolete-function-alias 386(define-obsolete-function-alias
387 'python-info-ppss-comment-or-string-p 387 'python-info-ppss-comment-or-string-p
388 #'python-syntax-comment-or-string-p "24.2") 388 #'python-syntax-comment-or-string-p "24.3")
389 389
390(defvar python-font-lock-keywords 390(defvar python-font-lock-keywords
391 ;; Keywords 391 ;; Keywords
@@ -588,10 +588,10 @@ It makes underscores and dots word constituent chars.")
588 :safe 'booleanp) 588 :safe 'booleanp)
589 589
590(define-obsolete-variable-alias 590(define-obsolete-variable-alias
591 'python-indent 'python-indent-offset "24.2") 591 'python-indent 'python-indent-offset "24.3")
592 592
593(define-obsolete-variable-alias 593(define-obsolete-variable-alias
594 'python-guess-indent 'python-indent-guess-indent-offset "24.2") 594 'python-guess-indent 'python-indent-guess-indent-offset "24.3")
595 595
596(defvar python-indent-current-level 0 596(defvar python-indent-current-level 0
597 "Current indentation level `python-indent-line-function' is using.") 597 "Current indentation level `python-indent-line-function' is using.")
@@ -1808,13 +1808,13 @@ there for compatibility with CEDET.")
1808 (get-buffer-process proc-buffer-name))) 1808 (get-buffer-process proc-buffer-name)))
1809 1809
1810(define-obsolete-function-alias 1810(define-obsolete-function-alias
1811 'python-proc 'python-shell-internal-get-or-create-process "24.2") 1811 'python-proc 'python-shell-internal-get-or-create-process "24.3")
1812 1812
1813(define-obsolete-variable-alias 1813(define-obsolete-variable-alias
1814 'python-buffer 'python-shell-internal-buffer "24.2") 1814 'python-buffer 'python-shell-internal-buffer "24.3")
1815 1815
1816(define-obsolete-variable-alias 1816(define-obsolete-variable-alias
1817 'python-preoutput-result 'python-shell-internal-last-output "24.2") 1817 'python-preoutput-result 'python-shell-internal-last-output "24.3")
1818 1818
1819(defun python-shell-send-string (string &optional process msg) 1819(defun python-shell-send-string (string &optional process msg)
1820 "Send STRING to inferior Python PROCESS. 1820 "Send STRING to inferior Python PROCESS.
@@ -1876,10 +1876,10 @@ Returns the output. See `python-shell-send-string-no-output'."
1876 (python-shell-internal-get-or-create-process) nil))) 1876 (python-shell-internal-get-or-create-process) nil)))
1877 1877
1878(define-obsolete-function-alias 1878(define-obsolete-function-alias
1879 'python-send-receive 'python-shell-internal-send-string "24.2") 1879 'python-send-receive 'python-shell-internal-send-string "24.3")
1880 1880
1881(define-obsolete-function-alias 1881(define-obsolete-function-alias
1882 'python-send-string 'python-shell-internal-send-string "24.2") 1882 'python-send-string 'python-shell-internal-send-string "24.3")
1883 1883
1884(defun python-shell-send-region (start end) 1884(defun python-shell-send-region (start end)
1885 "Send the region delimited by START and END to inferior Python process." 1885 "Send the region delimited by START and END to inferior Python process."
@@ -2369,7 +2369,7 @@ the if condition."
2369 :safe 'booleanp) 2369 :safe 'booleanp)
2370 2370
2371(define-obsolete-variable-alias 2371(define-obsolete-variable-alias
2372 'python-use-skeletons 'python-skeleton-autoinsert "24.2") 2372 'python-use-skeletons 'python-skeleton-autoinsert "24.3")
2373 2373
2374(defvar python-skeleton-available '() 2374(defvar python-skeleton-available '()
2375 "Internal list of available skeletons.") 2375 "Internal list of available skeletons.")
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index a713539cd8e..a6089aabb04 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -4076,7 +4076,7 @@ The document is bounded by `sh-here-document-word'."
4076 (self-insert-command (prefix-numeric-value arg)) 4076 (self-insert-command (prefix-numeric-value arg))
4077 (or arg (sh--maybe-here-document))) 4077 (or arg (sh--maybe-here-document)))
4078(make-obsolete 'sh--maybe-here-document 4078(make-obsolete 'sh--maybe-here-document
4079 'sh-electric-here-document-mode "24.2") 4079 'sh-electric-here-document-mode "24.3")
4080 4080
4081(defun sh--maybe-here-document () 4081(defun sh--maybe-here-document ()
4082 (or (not (looking-back "[^<]<<")) 4082 (or (not (looking-back "[^<]<<"))
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 02948b35fe0..02340425dfa 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -80,7 +80,7 @@
80For other modes it is disabled. If this is equal to t, 80For other modes it is disabled. If this is equal to t,
81then Which Function mode is enabled in any major mode that supports it." 81then Which Function mode is enabled in any major mode that supports it."
82 :group 'which-func 82 :group 'which-func
83 :version "24.2" ; explicit list -> t 83 :version "24.3" ; explicit list -> t
84 :type '(choice (const :tag "All modes" t) 84 :type '(choice (const :tag "All modes" t)
85 (repeat (symbol :tag "Major mode")))) 85 (repeat (symbol :tag "Major mode"))))
86 86
@@ -150,7 +150,7 @@ mouse-2: toggle rest visibility\n\
150mouse-3: go to end") 150mouse-3: go to end")
151 "]") 151 "]")
152 "Format for displaying the function in the mode line." 152 "Format for displaying the function in the mode line."
153 :version "24.2" ; added mouse-face 153 :version "24.2" ; added mouse-face; 24point2 is correct
154 :group 'which-func 154 :group 'which-func
155 :type 'sexp) 155 :type 'sexp)
156;;;###autoload (put 'which-func-format 'risky-local-variable t) 156;;;###autoload (put 'which-func-format 'risky-local-variable t)
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 6310190b4fe..215314d7053 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -278,9 +278,9 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
278 (print-level nil) 278 (print-level nil)
279 (print-readably t) 279 (print-readably t)
280 (print-quoted t)) 280 (print-quoted t))
281 ;; During the 24.2 development, read-passwd had a bug which resulted in 281 ;; During the 24.3 development, read-passwd had a bug which resulted in
282 ;; the passwords being saved by savehist. Trim them, retroactively. 282 ;; the passwords being saved by savehist. Trim them, retroactively.
283 ;; This code can be removed after the 24.2 release. 283 ;; This code can be removed after the 24.3 release.
284 (dolist (sym savehist-minibuffer-history-variables) 284 (dolist (sym savehist-minibuffer-history-variables)
285 (if (and (symbolp sym) (equal (symbol-name sym) "forget-history")) 285 (if (and (symbolp sym) (equal (symbol-name sym) "forget-history"))
286 (setq savehist-minibuffer-history-variables 286 (setq savehist-minibuffer-history-variables
diff --git a/lisp/server.el b/lisp/server.el
index a25da406571..6d34df351ca 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -163,7 +163,7 @@ key."
163 :type '(choice 163 :type '(choice
164 (const :tag "Random" nil) 164 (const :tag "Random" nil)
165 (string :tag "Password")) 165 (string :tag "Password"))
166 :version "24.2") 166 :version "24.3")
167 167
168(defcustom server-raise-frame t 168(defcustom server-raise-frame t
169 "If non-nil, raise frame when switching to a buffer." 169 "If non-nil, raise frame when switching to a buffer."
diff --git a/lisp/simple.el b/lisp/simple.el
index f644044a430..76243a202bc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -570,7 +570,7 @@ Trailing lines are deleted only if `delete-trailing-whitespace'
570is called on the entire buffer (rather than an active region)." 570is called on the entire buffer (rather than an active region)."
571 :type 'boolean 571 :type 'boolean
572 :group 'editing 572 :group 'editing
573 :version "24.2") 573 :version "24.3")
574 574
575(defun delete-trailing-whitespace (&optional start end) 575(defun delete-trailing-whitespace (&optional start end)
576 "Delete trailing whitespace between START and END. 576 "Delete trailing whitespace between START and END.
@@ -2295,7 +2295,7 @@ output buffer and running a new command in the default buffer,
2295 (const :tag "Rename the existing buffer" 2295 (const :tag "Rename the existing buffer"
2296 rename-buffer)) 2296 rename-buffer))
2297 :group 'shell 2297 :group 'shell
2298 :version "24.2") 2298 :version "24.3")
2299 2299
2300(defun async-shell-command (command &optional output-buffer error-buffer) 2300(defun async-shell-command (command &optional output-buffer error-buffer)
2301 "Execute string COMMAND asynchronously in background. 2301 "Execute string COMMAND asynchronously in background.
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 302e441d282..dfd0e95f61a 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -217,7 +217,7 @@ static char * stroke_xpm[] = {
217 :type 'string 217 :type 'string
218 :group 'strokes) 218 :group 'strokes)
219 219
220(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.2") 220(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.3")
221 221
222(defcustom strokes-character ?@ 222(defcustom strokes-character ?@
223 "Character used when drawing strokes in the strokes buffer. 223 "Character used when drawing strokes in the strokes buffer.
diff --git a/lisp/subr.el b/lisp/subr.el
index 04ff81e997a..1e367a155d0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1169,7 +1169,7 @@ be a list of the form returned by `event-start' and `event-end'."
1169(define-obsolete-function-alias 'string-to-int 'string-to-number "22.1") 1169(define-obsolete-function-alias 'string-to-int 'string-to-number "22.1")
1170 1170
1171(make-obsolete 'forward-point "use (+ (point) N) instead." "23.1") 1171(make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
1172(make-obsolete 'buffer-has-markers-at nil "24.2") 1172(make-obsolete 'buffer-has-markers-at nil "24.3")
1173 1173
1174(defun insert-string (&rest args) 1174(defun insert-string (&rest args)
1175 "Mocklisp-compatibility insert function. 1175 "Mocklisp-compatibility insert function.
@@ -1194,7 +1194,7 @@ is converted into a string by expressing it in decimal."
1194(set-advertised-calling-convention 1194(set-advertised-calling-convention
1195 'all-completions '(string collection &optional predicate) "23.1") 1195 'all-completions '(string collection &optional predicate) "23.1")
1196(set-advertised-calling-convention 'unintern '(name obarray) "23.3") 1196(set-advertised-calling-convention 'unintern '(name obarray) "23.3")
1197(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.2") 1197(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
1198 1198
1199;;;; Obsolescence declarations for variables, and aliases. 1199;;;; Obsolescence declarations for variables, and aliases.
1200 1200
@@ -2491,7 +2491,7 @@ This finishes the change group by reverting all of its changes."
2491 2491
2492;; For compatibility. 2492;; For compatibility.
2493(define-obsolete-function-alias 'redraw-modeline 2493(define-obsolete-function-alias 'redraw-modeline
2494 'force-mode-line-update "24.2") 2494 'force-mode-line-update "24.3")
2495 2495
2496(defun force-mode-line-update (&optional all) 2496(defun force-mode-line-update (&optional all)
2497 "Force redisplay of the current buffer's mode line and header line. 2497 "Force redisplay of the current buffer's mode line and header line.
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 77dc7cc29bb..767f8f360bb 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -215,12 +215,12 @@ Starts with the current official version. For developer versions
215in parentheses follows the development revision and the time stamp.") 215in parentheses follows the development revision and the time stamp.")
216 216
217(defconst rst-package-emacs-version-alist 217(defconst rst-package-emacs-version-alist
218 '(("1.0.0" . "24.2") 218 '(("1.0.0" . "24.3")
219 ("1.1.0" . "24.2") 219 ("1.1.0" . "24.3")
220 ("1.2.0" . "24.2") 220 ("1.2.0" . "24.3")
221 ("1.2.1" . "24.2") 221 ("1.2.1" . "24.3")
222 ("1.3.0" . "24.2") 222 ("1.3.0" . "24.3")
223 ("1.3.1" . "24.2") 223 ("1.3.1" . "24.3")
224 )) 224 ))
225 225
226(unless (assoc rst-official-version rst-package-emacs-version-alist) 226(unless (assoc rst-official-version rst-package-emacs-version-alist)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 957003ca2e0..620a1da633e 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1499,7 +1499,7 @@ Puts point on a blank line between them."
1499(defvar latex-complete-bibtex-cache nil) 1499(defvar latex-complete-bibtex-cache nil)
1500 1500
1501(define-obsolete-function-alias 'latex-string-prefix-p 1501(define-obsolete-function-alias 'latex-string-prefix-p
1502 'string-prefix-p "24.2") 1502 'string-prefix-p "24.3")
1503 1503
1504(defvar bibtex-reference-key) 1504(defvar bibtex-reference-key)
1505(declare-function reftex-get-bibfile-list "reftex-cite.el" ()) 1505(declare-function reftex-get-bibfile-list "reftex-cite.el" ())
@@ -2059,7 +2059,7 @@ IN can be either a string (with the same % escapes in it) indicating
2059OUT describes the output file and is either a %-escaped string 2059OUT describes the output file and is either a %-escaped string
2060 or nil to indicate that there is no output file.") 2060 or nil to indicate that there is no output file.")
2061 2061
2062(define-obsolete-function-alias 'tex-string-prefix-p 'string-prefix-p "24.2") 2062(define-obsolete-function-alias 'tex-string-prefix-p 'string-prefix-p "24.3")
2063 2063
2064(defun tex-guess-main-file (&optional all) 2064(defun tex-guess-main-file (&optional all)
2065 "Find a likely `tex-main-file'. 2065 "Find a likely `tex-main-file'.
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 46ad1daef01..4007d1f35b3 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -105,7 +105,7 @@ If the specified port number is the default, return nil."
105 (concat (car x) "=" (cdr x)) 105 (concat (car x) "=" (cdr x))
106 (car x))) 106 (car x)))
107 (url-attributes urlobj) ";")))) 107 (url-attributes urlobj) ";"))))
108(make-obsolete 'url-recreate-url-attributes nil "24.2") 108(make-obsolete 'url-recreate-url-attributes nil "24.3")
109 109
110;;;###autoload 110;;;###autoload
111(defun url-generic-parse-url (url) 111(defun url-generic-parse-url (url)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index d6b94a9179f..fb6f8d4d58b 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -229,7 +229,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
229 :version "21.1" 229 :version "21.1"
230 :group 'change-log) 230 :group 'change-log)
231(define-obsolete-face-alias 'change-log-acknowledgement 231(define-obsolete-face-alias 'change-log-acknowledgement
232 'change-log-acknowledgment "24.2") 232 'change-log-acknowledgment "24.3")
233(define-obsolete-face-alias 'change-log-acknowledgement-face 233(define-obsolete-face-alias 'change-log-acknowledgement-face
234 'change-log-acknowledgment "22.1") 234 'change-log-acknowledgment "22.1")
235 235
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 3fa7788002e..c6a9371ea9a 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1902,7 +1902,7 @@ For use in `add-log-current-defun-function'."
1902 :background "#aa2222")) 1902 :background "#aa2222"))
1903 "Face used for removed characters shown by `diff-refine-hunk'." 1903 "Face used for removed characters shown by `diff-refine-hunk'."
1904 :group 'diff-mode 1904 :group 'diff-mode
1905 :version "24.2") 1905 :version "24.3")
1906 1906
1907(defface diff-refine-added 1907(defface diff-refine-added
1908 '((default 1908 '((default
@@ -1913,7 +1913,7 @@ For use in `add-log-current-defun-function'."
1913 :background "#22aa22")) 1913 :background "#22aa22"))
1914 "Face used for added characters shown by `diff-refine-hunk'." 1914 "Face used for added characters shown by `diff-refine-hunk'."
1915 :group 'diff-mode 1915 :group 'diff-mode
1916 :version "24.2") 1916 :version "24.3")
1917 1917
1918(defun diff-refine-preproc () 1918(defun diff-refine-preproc ()
1919 (while (re-search-forward "^[+>]" nil t) 1919 (while (re-search-forward "^[+>]" nil t)
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index cc8ef4ad5c0..eee3f40fd96 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -68,7 +68,7 @@
68 'ediff-setup-windows-plain)) 68 'ediff-setup-windows-plain))
69 69
70(make-obsolete 'ediff-choose-window-setup-function-automatically 70(make-obsolete 'ediff-choose-window-setup-function-automatically
71 'ediff-setup-windows-default "24.2") 71 'ediff-setup-windows-default "24.3")
72 72
73(defcustom ediff-window-setup-function 'ediff-setup-windows-default 73(defcustom ediff-window-setup-function 'ediff-setup-windows-default
74 "Function called to set up windows. 74 "Function called to set up windows.
@@ -102,7 +102,7 @@ provided functions are written."
102 (const :tag "Single Frame" ediff-setup-windows-plain) 102 (const :tag "Single Frame" ediff-setup-windows-plain)
103 (function :tag "Other function")) 103 (function :tag "Other function"))
104 :group 'ediff-window 104 :group 'ediff-window
105 :version "24.2") 105 :version "24.3")
106 106
107;; indicates if we are in a multiframe setup 107;; indicates if we are in a multiframe setup
108(ediff-defvar-local ediff-multiframe nil "") 108(ediff-defvar-local ediff-multiframe nil "")
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 3d54bbd12a3..fdef490d4a2 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -182,7 +182,7 @@ arguments. If ARGS is not a list, no argument will be passed."
182 (if oneline (line-end-position) (point-max)))) 182 (if oneline (line-end-position) (point-max))))
183 (file-error nil))) 183 (file-error nil)))
184 184
185(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.2") 185(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.3")
186 186
187;;;; 187;;;;
188;;;; file names 188;;;; file names
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index e6b63030fef..babcf6f1beb 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -138,7 +138,7 @@ Used in `smerge-diff-base-mine' and related functions."
138 (t :inverse-video t)) 138 (t :inverse-video t))
139 "Face used for removed characters shown by `smerge-refine'." 139 "Face used for removed characters shown by `smerge-refine'."
140 :group 'smerge 140 :group 'smerge
141 :version "24.2") 141 :version "24.3")
142 142
143(defface smerge-refined-added 143(defface smerge-refined-added
144 '((default 144 '((default
@@ -150,7 +150,7 @@ Used in `smerge-diff-base-mine' and related functions."
150 (t :inverse-video t)) 150 (t :inverse-video t))
151 "Face used for added characters shown by `smerge-refine'." 151 "Face used for added characters shown by `smerge-refine'."
152 :group 'smerge 152 :group 'smerge
153 :version "24.2") 153 :version "24.3")
154 154
155(easy-mmode-defmap smerge-basic-map 155(easy-mmode-defmap smerge-basic-map
156 `(("n" . smerge-next) 156 `(("n" . smerge-next)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2d95b14244f..87028194aa2 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2803,7 +2803,7 @@ to provide the `find-revision' operation instead."
2803 2803
2804 2804
2805;; These things should probably be generally available 2805;; These things should probably be generally available
2806(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.2") 2806(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.3")
2807 2807
2808(defun vc-file-tree-walk (dirname func &rest args) 2808(defun vc-file-tree-walk (dirname func &rest args)
2809 "Walk recursively through DIRNAME. 2809 "Walk recursively through DIRNAME.