Replace version 24.2 with 24.3 where appropriate (hopefully)

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 2c4ed1f..487e3c1 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -365,7 +365,7 @@ flow control.
 
 @item
 Fabián E. Gallina rewrote @file{python.el}, the major mode for the
-Python programming language used in Emacs 24.2 onwards.
+Python programming language used in Emacs 24.3 onwards.
 
 @item
 Kevin 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
 for motion in ``CapitalizedWordIdentifiers''; @file{latin1-disp.el}, a
 package that lets you display ISO 8859 characters on Latin-1 terminals
 by setting up appropriate display tables; the version of
-@file{python.el} used prior to Emacs 24.2; @file{smiley.el}, a
+@file{python.el} used prior to Emacs 24.3; @file{smiley.el}, a
 facility for displaying smiley faces; @file{sym-comp.el}, a library
 for performing mode-dependent symbol completion; @file{benchmark.el}
 for timing code execution; and @file{tool-bar.el}, a mode to control

diff --git a/etc/NEWS b/etc/NEWS
index 5b0291a..6250bcf 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -21,7 +21,7 @@ When you add a new item, please add it without either +++ or ---
 so we will look at it and add it to the manual.
 
 \f
-* Installation Changes in Emacs 24.2
+* Installation Changes in Emacs 24.3
 
 ** New configure option '--without-all' to disable additonal features.
 This 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
 check that this option enables.
 
 \f
-* Startup Changes in Emacs 24.2
+* Startup Changes in Emacs 24.3
 
 ** Emacs no longer searches for `leim-list.el' files beneath the standard
 lisp/ 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.
 ** The `--no-site-lisp' command line option now works for Nextstep builds.
 
 \f
-* Changes in Emacs 24.2
+* Changes in Emacs 24.3
 
 ** Help changes
 
@@ -158,7 +158,7 @@ for it.
 The PCL-CVS commands are still available via the keyboard.
 
 \f
-* Editing Changes in Emacs 24.2
+* Editing Changes in Emacs 24.3
 
 ** New option `delete-trailing-lines' specifies whether the M-x
 delete-trailing-whitespace command should delete trailing lines at the
@@ -189,7 +189,7 @@ It copies the region-rectangle as the last rectangle kill.
 ** New input method `vietnamese-vni'.
 
 \f
-* Changes in Specialized Modes and Packages in Emacs 24.2
+* Changes in Specialized Modes and Packages in Emacs 24.3
 
 ** Term changes
 
@@ -502,9 +502,9 @@ inefficiency, and not namespace-clean.
 *** cust-print.el
 
 \f
-* New Modes and Packages in Emacs 24.2
+* New Modes and Packages in Emacs 24.3
 \f
-* Incompatible Lisp Changes in Emacs 24.2
+* Incompatible Lisp Changes in Emacs 24.3
 
 ** The function `x-select-font' can return a font spec, instead of a
 font 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.
 *** `last-input-char' and `last-command-char'
 
 \f
-* Lisp changes in Emacs 24.2
+* Lisp changes in Emacs 24.3
 
 ** New functions `autoloadp' and `autoload-do-load'.
 
@@ -624,7 +624,7 @@ by the underlying C implementation.
 ** `automount-dir-prefix' is obsolete.
 ** `buffer-has-markers-at' is obsolete.
 \f
-* Changes in Emacs 24.2 on non-free operating systems
+* Changes in Emacs 24.3 on non-free operating systems
 
 ** New configure.bat options on MS-Windows:
 
@@ -636,6 +636,10 @@ Emacs now supports mouse highlight, help-echo (in the echo area), and
 mouse-autoselect-window.
 
 ** On MS-Windows Vista and later Emacs now supports symbolic links.
+\f
+* Changes in Emacs 24.2
+
+** This release mainly fixes a security issue.
 
 \f
 * Installation Changes in Emacs 24.1

diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index c66c47b..fd1dc0d 100644 (file)
--- 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'."
 
 (define-obsolete-function-alias
   'hangul-input-method-inactivate
-  'hangul-input-method-deactivate "24.2")
+  'hangul-input-method-deactivate "24.3")
 
 (defun hangul-input-method-help ()
   "Describe the current Hangul input method."

diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 1cab31f..7946c08 100644 (file)
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -114,7 +114,7 @@ While this input method is active, the variable
 
 (define-obsolete-function-alias
   'ucs-input-inactivate
-  'ucs-input-deactivate "24.2")
+  'ucs-input-deactivate "24.3")
 
 (defun ucs-input-help ()
   (interactive)

diff --git a/lisp/allout.el b/lisp/allout.el
index 9034d00..acf0b7d 100644 (file)
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1415,7 +1415,7 @@ their settings before allout-mode was started."
 
 ;;;_   = allout-exposure-change-functions
 (define-obsolete-variable-alias 'allout-exposure-change-hook
-  'allout-exposure-change-functions "24.2")
+  'allout-exposure-change-functions "24.3")
 (defcustom allout-exposure-change-functions nil
   "Abnormal hook run after allout outline subtree exposure changes.
 It is run at the conclusion of `allout-flag-region'.
@@ -1429,11 +1429,11 @@ Functions on the hook must take three arguments:
 This hook might be invoked multiple times by a single command."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-structure-added-functions
 (define-obsolete-variable-alias 'allout-structure-added-hook
-  'allout-structure-added-functions "24.2")
+  'allout-structure-added-functions "24.3")
 (defcustom allout-structure-added-functions nil
   "Abnormal hook run after adding items to an Allout outline.
 Functions on the hook should take two arguments:
@@ -1444,11 +1444,11 @@ Functions on the hook should take two arguments:
 This hook might be invoked multiple times by a single command."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-structure-deleted-functions
 (define-obsolete-variable-alias 'allout-structure-deleted-hook
-  'allout-structure-deleted-functions "24.2")
+  'allout-structure-deleted-functions "24.3")
 (defcustom allout-structure-deleted-functions nil
   "Abnormal hook run after deleting subtrees from an Allout outline.
 Functions on the hook must take two arguments:
@@ -1462,11 +1462,11 @@ specifically edits that native allout routines do not control.
 This hook might be invoked multiple times by a single command."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-structure-shifted-functions
 (define-obsolete-variable-alias 'allout-structure-shifted-hook
-  'allout-structure-shifted-functions "24.2")
+  'allout-structure-shifted-functions "24.3")
 (defcustom allout-structure-shifted-functions nil
   "Abnormal hook run after shifting items in an Allout outline.
 Functions on the hook should take two arguments:
@@ -1480,14 +1480,14 @@ that native allout routines do not control.
 This hook might be invoked multiple times by a single command."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-after-copy-or-kill-hook
 (defcustom allout-after-copy-or-kill-hook nil
   "Normal hook run after copying outline text.."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-post-undo-hook
 (defcustom allout-post-undo-hook nil
@@ -1496,7 +1496,7 @@ The item that's current when the hook is run *may* be the one
 that was affected by the undo.."
   :type 'hook
   :group 'allout
-  :version "24.2")
+  :version "24.3")
 
 ;;;_   = allout-outside-normal-auto-fill-function
 (defvar allout-outside-normal-auto-fill-function nil

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 6c6e3b3..88d5602 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -88,44 +88,44 @@ include key-binding information in its output."
   '((t (:inherit bold)))
   "Face for the symbol name in Apropos output."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defface apropos-keybinding
   '((t (:inherit underline)))
   "Face for lists of keybinding in Apropos output."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defface apropos-property
   '((t (:inherit font-lock-builtin-face)))
   "Face for property name in apropos output, or nil for none."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defface apropos-function-button
   '((t (:inherit (font-lock-function-name-face button))))
   "Button face indicating a function, macro, or command in Apropos."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defface apropos-variable-button
   '((t (:inherit (font-lock-variable-name-face button))))
   "Button face indicating a variable in Apropos."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defface apropos-misc-button
   '((t (:inherit (font-lock-constant-face button))))
   "Button face indicating a miscellaneous object type in Apropos."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defcustom apropos-match-face 'match
   "Face for matching text in Apropos documentation/value, or nil for none.
 This applies when you look for matches in the documentation or variable value
 for the pattern; the part that matches gets displayed in this font."
   :group 'apropos
-  :version "24.2")
+  :version "24.3")
 
 (defcustom apropos-sort-by-scores nil
   "Non-nil means sort matches by scores; best match is shown first.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 5d8fa26..c20a7f3 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -143,7 +143,7 @@ message to display when the mouse is moved over the mode line.
 If the text at the mouse position has a `help-echo' text
 property, that overrides this variable."
   :type '(choice (const :tag "No help" :value nil) string)
-  :version "24.2"
+  :version "24.3"
   :group 'mode-line)
 
 (defvar mode-line-front-space '(:eval (if (display-graphic-p) " " "-"))

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 490d59a..589b6eb 100644 (file)
--- 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'
 minus `Buffer-menu-size-width'.  This use is deprecated."
   :type 'number
   :group 'Buffer-menu
-  :version "24.2")
+  :version "24.3")
 
 (make-obsolete-variable 'Buffer-menu-buffer+size-width
                        "`Buffer-menu-name-width' and `Buffer-menu-size-width'"
-                       "24.2")
+                       "24.3")
 
 (defcustom Buffer-menu-name-width 19
   "Width of buffer size column in the Buffer Menu."
   :type 'number
   :group 'Buffer-menu
-  :version "24.2")
+  :version "24.3")
 
 (defcustom Buffer-menu-size-width 7
   "Width of buffer name column in the Buffer Menu."
   :type 'number
   :group 'Buffer-menu
-  :version "24.2")
+  :version "24.3")
 
 (defcustom Buffer-menu-mode-width 16
   "Width of mode name column in the Buffer Menu."

diff --git a/lisp/calc/README b/lisp/calc/README
index f4f6b0f..25d1a5e 100644 (file)
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -70,7 +70,7 @@ opinions.
 Summary of changes to "Calc"
 ------- -- ------- --  ----
 
-Emacs 24.2
+Emacs 24.3
 
 Algebraic simplification mode is now the default.
 To restrict to the limited simplifications given by the former

diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 9e9544d..dff3704 100644 (file)
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -68,7 +68,7 @@
 
 (defcustom cal-html-holidays t
   "If non-nil, include holidays as well as diary entries."
-  :version "24.2"
+  :version "24.3"
   :type 'boolean
   :group 'calendar-html)
 
@@ -92,7 +92,7 @@
    "</STYLE>\n\n")
   "Default cal-html css style.  You can override this with a \"cal.css\" file."
   :type 'string
-  :version "24.2"                       ; added SPAN.HOLIDAY
+  :version "24.3"                       ; added SPAN.HOLIDAY
   :group 'calendar-html)
 
 ;;; End customizable variables.

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 2452f44..a40c05f 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -239,7 +239,7 @@ This definition is the heart of the calendar!")
 
 (autoload 'holiday-in-range "holidays")
 
-(define-obsolete-function-alias 'cal-tex-list-holidays 'holiday-in-range "24.2")
+(define-obsolete-function-alias 'cal-tex-list-holidays 'holiday-in-range "24.3")
 
 (autoload 'diary-list-entries "diary-lib")
 

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 8ca14b3..2ebb8c7 100644 (file)
--- 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 [].")
 ;;; User Functions:
 
 (define-obsolete-function-alias 'timeclock-modeline-display
-  'timeclock-mode-line-display "24.2")
+  'timeclock-mode-line-display "24.3")
 
 ;;;###autoload
 (defun timeclock-mode-line-display (&optional arg)
@@ -649,7 +649,7 @@ arguments of `completing-read'."
                             (mapcar 'list timeclock-reason-list)))
 
 (define-obsolete-function-alias 'timeclock-update-modeline
-  'timeclock-update-mode-line "24.2")
+  'timeclock-update-mode-line "24.3")
 
 (defun timeclock-update-mode-line ()
   "Update the `timeclock-mode-string' displayed in the mode line.

diff --git a/lisp/comint.el b/lisp/comint.el
index 431d05b..5b0eb30 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3046,7 +3046,7 @@ See `comint-word'."
 (defun comint--unquote-argument (str)
   (car (comint--unquote&requote-argument str)))
 (define-obsolete-function-alias 'comint--unquote&expand-filename
-  #'comint--unquote-argument "24.2")
+  #'comint--unquote-argument "24.3")
 
 (defun comint-match-partial-filename ()
   "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'."
       filename
     (save-match-data
       (replace-regexp-in-string "\\\\\\(.\\)" "\\1" filename t))))
-(make-obsolete 'comint-unquote-filename nil "24.2")
+(make-obsolete 'comint-unquote-filename nil "24.3")
 
 (defun comint--requote-argument (upos qstr)
   ;; See `completion-table-with-quoting'.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0ee2ea4..86a1913 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1541,7 +1541,7 @@ that option."
 This button will have a menu with all three reset operations."
   :type 'boolean
   :group 'custom-buffer
-  :version "24.2")
+  :version "24.3")
 
 (defcustom custom-buffer-verbose-help t
   "If non-nil, include explanatory text in the customization buffer."

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5f7f5b..0eb8b2d 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -204,7 +204,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (delete-by-moving-to-trash auto-save boolean "23.1")
             (auto-save-visited-file-name auto-save boolean)
             ;; filelock.c
-            (create-lockfiles files boolean "24.2")
+            (create-lockfiles files boolean "24.3")
             (temporary-file-directory
              ;; Darwin section added 24.1, does not seem worth :version bump.
              files directory nil

diff --git a/lisp/custom.el b/lisp/custom.el
index edb7fe2..fb166dd 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -611,7 +611,7 @@ property, or (ii) an alias for another customizable variable."
     (or (get variable 'standard-value)
        (get variable 'custom-autoload))))
 
-(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.2")
+(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.3")
 
 (defun custom-note-var-changed (variable)
   "Inform Custom that VARIABLE has been set (changed).

diff --git a/lisp/dired.el b/lisp/dired.el
index 3aa0088..6684be3 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3476,7 +3476,7 @@ The idea is to set this buffer-locally in special dired buffers.")
     (force-mode-line-update)))
 
 (define-obsolete-function-alias 'dired-sort-set-modeline
-  'dired-sort-set-mode-line "24.2")
+  'dired-sort-set-mode-line "24.3")
 
 (defun dired-sort-toggle-or-edit (&optional arg)
   "Toggle sorting by date, and refresh the Dired buffer.

diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index f71554e..5d9ddc1 100644 (file)
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -201,7 +201,7 @@ See the documentation of `electric-buffer-list' for details."
        "return to buffer editing"))
 
 (define-obsolete-function-alias 'Electric-buffer-menu-mode
-  'electric-buffer-menu-mode "24.2")
+  'electric-buffer-menu-mode "24.3")
 
 ;; generally the same as Buffer-menu-mode-map
 ;;  (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 925d275..9b66c8f 100644 (file)
--- 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'."
 ;;   nil)
 
 (make-obsolete-variable 'macro-declaration-function
-                        'macro-declarations-alist "24.2")
+                        'macro-declarations-alist "24.3")
 (make-obsolete 'macro-declaration-function
-               'macro-declarations-alist "24.2")
+               'macro-declarations-alist "24.3")
 
 ;;; byte-run.el ends here

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index aa12c70..86497a3 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -99,8 +99,8 @@
 ;;;###autoload
 (define-obsolete-variable-alias
   ;; This alias is needed for compatibility with .elc files that use defstruct
-  ;; and were compiled with Emacs<24.2.
-  'custom-print-functions 'cl-custom-print-functions "24.2")
+  ;; and were compiled with Emacs<24.3.
+  'custom-print-functions 'cl-custom-print-functions "24.3")
 
 ;;;###autoload
 (defvar cl-custom-print-functions nil

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index c9ed9ef..ae0852d 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -452,7 +452,7 @@ definitions, or lack thereof).
 
 \(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
   (declare (indent 1) (debug cl-flet)
-           (obsolete "Use either `cl-flet' or `cl-letf'."  "24.2"))
+           (obsolete "Use either `cl-flet' or `cl-letf'."  "24.3"))
   `(letf ,(mapcar
            (lambda (x)
              (if (or (and (fboundp (car x))
@@ -480,7 +480,7 @@ will not work - use `labels' instead" (symbol-name (car x))))
   "Make temporary function bindings.
 Like `cl-labels' except that the lexical scoping is handled via `lexical-let'
 rather than relying on `lexical-binding'."
-  (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.2"))
+  (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.3"))
   (let ((vars nil) (sets nil) (newenv macroexpand-all-environment))
     (dolist (binding bindings)
       ;; 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."
 
 (defun cl--gv-adapt (cl-gv do)
   ;; This function is used by all .elc files that use define-setf-expander and
-  ;; were compiled with Emacs>=24.2.
+  ;; were compiled with Emacs>=24.3.
   (let ((vars (nth 0 cl-gv))
         (vals (nth 1 cl-gv))
         (binds ())
@@ -632,7 +632,7 @@ Example:
 ;;                      `(,witness ,getter ,(funcall setter witness)))))
 ;;     ...find "let prefix" of expansion, extract getter and setter from
 ;;     ...the rest, and build the 5-tuple))
-(make-obsolete 'get-setf-method 'gv-letplace "24.2")
+(make-obsolete 'get-setf-method 'gv-letplace "24.3")
 
 (defmacro define-modify-macro (name arglist func &optional doc)
   "Define a `setf'-like modify macro.
@@ -653,52 +653,52 @@ from ARGLIST using FUNC: (define-modify-macro incf (&optional (n 1)) +)"
 ;;; Additional compatibility code.
 ;; For names that were clean but really aren't needed any more.
 
-(define-obsolete-function-alias 'cl-macroexpand 'macroexpand "24.2")
+(define-obsolete-function-alias 'cl-macroexpand 'macroexpand "24.3")
 (define-obsolete-variable-alias 'cl-macro-environment
-  'macroexpand-all-environment "24.2")
-(define-obsolete-function-alias 'cl-macroexpand-all 'macroexpand-all "24.2")
+  'macroexpand-all-environment "24.3")
+(define-obsolete-function-alias 'cl-macroexpand-all 'macroexpand-all "24.3")
 
 ;;; Hash tables.
 ;; This is just kept for compatibility with code byte-compiled by Emacs-20.
 
 ;; No idea if this might still be needed.
 (defun cl-not-hash-table (x &optional y &rest _z)
-  (declare (obsolete nil "24.2"))
+  (declare (obsolete nil "24.3"))
   (signal 'wrong-type-argument (list 'cl-hash-table-p (or y x))))
 
 (defvar cl-builtin-gethash (symbol-function 'gethash))
-(make-obsolete-variable 'cl-builtin-gethash nil "24.2")
+(make-obsolete-variable 'cl-builtin-gethash nil "24.3")
 (defvar cl-builtin-remhash (symbol-function 'remhash))
-(make-obsolete-variable 'cl-builtin-remhash nil "24.2")
+(make-obsolete-variable 'cl-builtin-remhash nil "24.3")
 (defvar cl-builtin-clrhash (symbol-function 'clrhash))
-(make-obsolete-variable 'cl-builtin-clrhash nil "24.2")
+(make-obsolete-variable 'cl-builtin-clrhash nil "24.3")
 (defvar cl-builtin-maphash (symbol-function 'maphash))
 
-(make-obsolete-variable 'cl-builtin-maphash nil "24.2")
-(define-obsolete-function-alias 'cl-map-keymap 'map-keymap "24.2")
-(define-obsolete-function-alias 'cl-copy-tree 'copy-tree "24.2")
-(define-obsolete-function-alias 'cl-gethash 'gethash "24.2")
-(define-obsolete-function-alias 'cl-puthash 'puthash "24.2")
-(define-obsolete-function-alias 'cl-remhash 'remhash "24.2")
-(define-obsolete-function-alias 'cl-clrhash 'clrhash "24.2")
-(define-obsolete-function-alias 'cl-maphash 'maphash "24.2")
-(define-obsolete-function-alias 'cl-make-hash-table 'make-hash-table "24.2")
-(define-obsolete-function-alias 'cl-hash-table-p 'hash-table-p "24.2")
-(define-obsolete-function-alias 'cl-hash-table-count 'hash-table-count "24.2")
+(make-obsolete-variable 'cl-builtin-maphash nil "24.3")
+(define-obsolete-function-alias 'cl-map-keymap 'map-keymap "24.3")
+(define-obsolete-function-alias 'cl-copy-tree 'copy-tree "24.3")
+(define-obsolete-function-alias 'cl-gethash 'gethash "24.3")
+(define-obsolete-function-alias 'cl-puthash 'puthash "24.3")
+(define-obsolete-function-alias 'cl-remhash 'remhash "24.3")
+(define-obsolete-function-alias 'cl-clrhash 'clrhash "24.3")
+(define-obsolete-function-alias 'cl-maphash 'maphash "24.3")
+(define-obsolete-function-alias 'cl-make-hash-table 'make-hash-table "24.3")
+(define-obsolete-function-alias 'cl-hash-table-p 'hash-table-p "24.3")
+(define-obsolete-function-alias 'cl-hash-table-count 'hash-table-count "24.3")
 
 (define-obsolete-function-alias 'cl-map-keymap-recursively
-  'cl--map-keymap-recursively "24.2")
-(define-obsolete-function-alias 'cl-map-intervals 'cl--map-intervals "24.2")
-(define-obsolete-function-alias 'cl-map-extents 'cl--map-overlays "24.2")
+  'cl--map-keymap-recursively "24.3")
+(define-obsolete-function-alias 'cl-map-intervals 'cl--map-intervals "24.3")
+(define-obsolete-function-alias 'cl-map-extents 'cl--map-overlays "24.3")
 
 (defun cl-maclisp-member (item list)
-  (declare (obsolete member "24.2"))
+  (declare (obsolete member "24.3"))
   (while (and list (not (equal item (car list)))) (setq list (cdr list)))
   list)
 
 ;; Used in the expansion of the old `defstruct'.
 (defun cl-struct-setf-expander (x name accessor pred-form pos)
-  (declare (obsolete nil "24.2"))
+  (declare (obsolete nil "24.3"))
   (let* ((temp (make-symbol "--cl-x--")) (store (make-symbol "--cl-store--")))
     (list (list temp) (list x) (list store)
          `(progn

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 910d940..7fcd339 100644 (file)
--- 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
 be installed in `emacs-lisp-mode-map'.")
 
 (define-obsolete-variable-alias 'gud-inhibit-global-bindings
-  'edebug-inhibit-emacs-lisp-mode-bindings "24.2")
+  'edebug-inhibit-emacs-lisp-mode-bindings "24.3")
 
 ;; Global GUD bindings for all emacs-lisp-mode buffers.
 (unless edebug-inhibit-emacs-lisp-mode-bindings

diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 5f4be78..9304f0e 100644 (file)
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -2554,7 +2554,7 @@ This is usually a symbol that starts with `:'."
 (defsetf eieio-oref eieio-oset)
 
 (if (eval-when-compile (fboundp 'gv-define-expander))
-    ;; Not needed for Emacs>=24.2 since gv.el's setf expands macros and
+    ;; Not needed for Emacs>=24.3 since gv.el's setf expands macros and
     ;; follows aliases.
     nil
 (defsetf slot-value eieio-oset)

diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 6d91238..5343d49 100644 (file)
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -86,7 +86,7 @@ for both actions (NOT RECOMMENDED)."
 The functions get one argument, the first locked buffer found."
   :type 'hook
   :group 'emacs-lock
-  :version "24.2")
+  :version "24.3")
 
 (defvar emacs-lock-mode nil
   "If non-nil, the current buffer is locked.

diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index d29736d..c9822b7 100644 (file)
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -177,7 +177,7 @@ nice to the world.")
   :group 'crisp)
 
 (define-obsolete-variable-alias 'crisp-mode-modeline-string
-  'crisp-mode-mode-line-string "24.2")
+  'crisp-mode-mode-line-string "24.3")
 
 ;;;###autoload
 (defcustom crisp-mode nil

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index cce24e6..5da3009 100644 (file)
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -396,7 +396,7 @@ isn't displayed."
 (defcustom erc-server-timestamp-format "%Y-%m-%d %T"
   "Timestamp format used with server response messages.
 This string is processed using `format-time-string'."
-  :version "24.2"
+  :version "24.3"
   :type 'string
   :group 'erc-server)
 

diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 66256ee..4d0534d 100644 (file)
--- 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
 the unprocessed output.")
 
 (define-obsolete-variable-alias 'erc-dcc-chat-filter-hook
-  'erc-dcc-chat-filter-functions "24.2")
+  'erc-dcc-chat-filter-functions "24.3")
 
 (defvar erc-dcc-chat-mode-map
   (let ((map (make-sparse-keymap)))

diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 259eb20..8daf9be 100644 (file)
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -237,7 +237,7 @@ current-nick, keyword, pal, dangerous-host, fool"
 useful for excluding all the things like MOTDs from the server
 and other miscellaneous functions."
   :group 'erc-match
-  :version "24.2"
+  :version "24.3"
   :type 'boolean)
 
 ;; Internal variables:

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 9da3f8e..8a9107e 100644 (file)
--- 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'."
   :group 'eshell-mode)
 
 (define-obsolete-variable-alias 'eshell-status-in-modeline
-  'eshell-status-in-mode-line "24.2")
+  'eshell-status-in-mode-line "24.3")
 
 (defvar eshell-first-time-p t
   "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 2d5dc2a..c663de3 100644 (file)
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -245,14 +245,14 @@ shells such as bash, zsh, rc, 4dos."
   "Add `eshell-buffer-name' to `same-window-buffer-names'."
   (add-to-list 'same-window-buffer-names eshell-buffer-name))
 (make-obsolete 'eshell-add-to-window-buffer-names
-              "no longer needed." "24.2")
+              "no longer needed." "24.3")
 
 (defun eshell-remove-from-window-buffer-names ()
   "Remove `eshell-buffer-name' from `same-window-buffer-names'."
   (setq same-window-buffer-names
        (delete eshell-buffer-name same-window-buffer-names)))
 (make-obsolete 'eshell-remove-from-window-buffer-names
-              "no longer needed." "24.2")
+              "no longer needed." "24.3")
 
 (defcustom eshell-load-hook nil
   "A hook run once Eshell has been loaded."

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 3d1f402..d0f3b63 100644 (file)
--- 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
 schemes (e.g. \"ftp\"); in that case, only convert those URLs."
   :type '(choice (repeat string) boolean)
   :group 'ffap
-  :version "24.2")
+  :version "24.3")
 
 (defcustom ffap-ftp-default-user "anonymous"
   "User name in ftp file names generated by `ffap-host-to-path'.

diff --git a/lisp/files.el b/lisp/files.el
index bec494b..5caa468 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1000,7 +1000,7 @@ Tip: You can use this expansion of remote identifier components
                 (setq list (cdr list))))
      (or (car list) "ssh")))
   "Program to use to execute commands on a remote host (e.g. ssh or rsh)."
-  :version "24.2"                      ; ssh rather than rsh, etc
+  :version "24.3"                      ; ssh rather than rsh, etc
   :initialize 'custom-initialize-delay
   :group 'environment
   :type 'file)
@@ -1621,7 +1621,7 @@ Choose the buffer's name using `generate-new-buffer-name'."
   "Regexp to match the automounter prefix in a directory name."
   :group 'files
   :type 'regexp)
-(make-obsolete-variable 'automount-dir-prefix 'directory-abbrev-alist "24.2")
+(make-obsolete-variable 'automount-dir-prefix 'directory-abbrev-alist "24.3")
 
 (defvar abbreviated-home-dir nil
   "The user's homedir abbreviated according to `directory-abbrev-alist'.")
@@ -3640,7 +3640,7 @@ is found.  Returns the new class name."
 
 (defcustom enable-remote-dir-locals nil
   "Non-nil means dir-local variables will be applied to remote files."
-  :version "24.2"
+  :version "24.3"
   :type 'boolean
   :group 'find-file)
 

diff --git a/lisp/frame.el b/lisp/frame.el
index e905e66..0122563 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1651,7 +1651,7 @@ terminals, cursor blinking is controlled by the terminal."
 \f
 ;; Misc.
 
-;; Only marked as obsolete in 24.2.
+;; Only marked as obsolete in 24.3.
 (define-obsolete-variable-alias 'automatic-hscrolling
   'auto-hscroll-mode "22.1")
 

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index bcd2cd4..594f68b 100644 (file)
--- 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
 nil, Gcc will be done according to existing Gcc header(s), if any.
 If this is `no-gcc-self', resent messages will be Gcc'd to groups that
 existing Gcc header specifies, except for the current group."
-  :version "24.2"
+  :version "24.3"
   :group 'gnus-message
   :type '(choice (const none) (const t) string (const nil)
                 (const no-gcc-self)))

diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 3b335b3..44f56b5 100644 (file)
--- 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."
 (defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
   "List of image properties applied to picons."
   :type 'list
-  :version "24.2"
+  :version "24.3"
   :group 'gnus-picon)
 
 (defcustom gnus-picon-style 'inline

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 939d56b..8fd89b1 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1336,7 +1336,7 @@ If nil, you might be asked to input the charset."
   "*Addresses to prune when doing wide replies.
 This can be a regexp or a list of regexps.  Also, a value of nil means
 exclude your own user name only."
-  :version "24.2"
+  :version "24.3"
   :group 'message
   :link '(custom-manual "(message)Wide Reply")
   :type '(choice (const :tag "Yourself" nil)

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 1645f49..93f04cd 100644 (file)
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -559,7 +559,7 @@ parameter.  It should return nil, `warn' or `delete'."
   "Extra headers to parse.
 In addition to the standard headers, these extra headers will be
 included in NOV headers (and the like) when backends parse headers."
-  :version "24.2"
+  :version "24.3"
   :group 'nnmail
   :type '(repeat symbol))
 

diff --git a/lisp/help.el b/lisp/help.el
index c02b058..19cb811 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1038,7 +1038,7 @@ construct (see `substitute-command-keys'), the library is loaded,
 so that the documentation can show the right key bindings."
   :type 'boolean
   :group 'help
-  :version "24.2")
+  :version "24.3")
 
 (defun help-window-display-message (quit-part window &optional scroll)
   "Display message telling how to quit and scroll help window.

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 75094cd..7dd3980 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -58,7 +58,7 @@
                  (const 32)
                  (const 64))
   :group 'hexl
-  :version "24.2")
+  :version "24.3")
 
 (defcustom hexl-program "hexl"
   "The program that will hexlify and dehexlify its stdin.

diff --git a/lisp/image.el b/lisp/image.el
index f5a2de5..7801923 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -774,7 +774,7 @@ has no effect."
   :set (lambda (symbol value)
         (set-default symbol value)
         (imagemagick-register-types))
-  :version "24.2"
+  :version "24.3"
   :group 'image)
 
 (defcustom imagemagick-enabled-types
@@ -812,7 +812,7 @@ has no effect."
   :set (lambda (symbol value)
         (set-default symbol value)
         (imagemagick-register-types))
-  :version "24.2"
+  :version "24.3"
   :group 'image)
 
 (imagemagick-register-types)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 30dc88a..2fc9759 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1333,7 +1333,7 @@ of `history-length', which see.")
 
 (define-obsolete-variable-alias
   'inactivate-current-input-method-function
-  'deactivate-current-input-method-function "24.2")
+  'deactivate-current-input-method-function "24.3")
 (defvar deactivate-current-input-method-function nil
   "Function to call for deactivating the current input method.
 Every input method should set this to an appropriate value when activated.
@@ -1473,7 +1473,7 @@ If INPUT-METHOD is nil, deactivate any current input method."
 
 (define-obsolete-function-alias
   'inactivate-input-method
-  'deactivate-input-method "24.2")
+  'deactivate-input-method "24.3")
 
 (defun set-input-method (input-method &optional interactive)
   "Select and activate input method INPUT-METHOD for the current buffer.
@@ -1651,7 +1651,7 @@ just activated."
 
 (define-obsolete-variable-alias
   'input-method-inactivate-hook
-  'input-method-deactivate-hook "24.2")
+  'input-method-deactivate-hook "24.3")
 
 (defcustom input-method-deactivate-hook nil
   "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
 just deactivated."
   :type 'hook
   :group 'mule
-  :version "24.2")
+  :version "24.3")
 
 (defcustom input-method-after-insert-chunk-hook nil
   "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,
      (t
       (cdr (assoc-string input (ucs-names) t))))))
 
-(define-obsolete-function-alias 'ucs-insert 'insert-char "24.2")
+(define-obsolete-function-alias 'ucs-insert 'insert-char "24.3")
 (define-key ctl-x-map "8\r" 'insert-char)
 
 ;;; mule-cmds.el ends here

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 65ef807..4669528 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -547,7 +547,7 @@ This function runs the normal hook `quail-deactivate-hook'."
   (interactive)
   (quail-activate -1))
 
-(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "24.2")
+(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "24.3")
 
 (defun quail-activate (&optional arg)
   "Activate Quail input method.
@@ -595,7 +595,7 @@ While this input method is active, the variable
 
 (define-obsolete-variable-alias
   'quail-inactivate-hook
-  'quail-deactivate-hook "24.2")
+  'quail-deactivate-hook "24.3")
 
 (defun quail-exit-from-minibuffer ()
   (deactivate-input-method)

diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index fee4c33..897075f 100644 (file)
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -396,7 +396,7 @@ A nil value means no package is selected.")
   (interactive)
   (robin-activate -1))
 
-(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.2")
+(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.3")
 
 (defun robin-activate (&optional arg)
   "Activate robin input method.
@@ -431,7 +431,7 @@ While this input method is active, the variable
 
 (define-obsolete-variable-alias
   'robin-inactivate-hook
-  'robin-deactivate-hook "24.2")
+  'robin-deactivate-hook "24.3")
 
 (defun robin-exit-from-minibuffer ()
   (deactivate-input-method)

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 4afd974..8b7a0ab 100644 (file)
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -4133,7 +4133,7 @@ For example, the function `case' has an indent property
 ;;;;;;  653810 0))
 ;;; Generated autoloads from emacs-lisp/cl-lib.el
 
-(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.2")
+(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3")
 
 (defvar cl-custom-print-functions nil "\
 This is a list of functions that format user objects for printing.

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8cc72e1..6ee3c78 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -355,7 +355,7 @@ usually do not have translators for other languages.\n\n")))
           (buffer-substring-no-properties (point-min) (point)))
     (goto-char user-point)))
 
-(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.2")
+(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.3")
 
 ;; It's the default mail mode, so it seems OK to use its features.
 (autoload 'message-bogus-recipient-p "message")

diff --git a/lisp/man.el b/lisp/man.el
index 36f8061..198cdba 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -129,19 +129,19 @@ the manpage buffer."
   '((t (:inherit bold)))
   "Face to use when fontifying overstrike."
   :group 'man
-  :version "24.2")
+  :version "24.3")
 
 (defface Man-underline
   '((t (:inherit underline)))
   "Face to use when fontifying underlining."
   :group 'man
-  :version "24.2")
+  :version "24.3")
 
 (defface Man-reverse
   '((t (:inherit highlight)))
   "Face to use when fontifying reverse video."
   :group 'man
-  :version "24.2")
+  :version "24.3")
 
 (defvar Man-ansi-color-map (let ((ansi-color-faces-vector
                                  [ default Man-overstrike default Man-underline

diff --git a/lisp/mpc.el b/lisp/mpc.el
index f1dbb38..e8b5c50 100644 (file)
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -184,7 +184,7 @@ numerically rather than lexicographically."
                     (abs res))
                 res))))))))
 
-(define-obsolete-function-alias 'mpc-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'mpc-string-prefix-p 'string-prefix-p "24.3")
 
 ;; This can speed up mpc--song-search significantly.  The table may grow
 ;; very large, tho.  It's only bounded by the fact that it gets flushed

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index d0200f4..772a0a9 100644 (file)
--- 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.
 
 ;; `dbus-call-method' works non-blocking now.
 (defalias 'dbus-call-method-non-blocking 'dbus-call-method)
-(make-obsolete 'dbus-call-method-non-blocking 'dbus-call-method "24.2")
+(make-obsolete 'dbus-call-method-non-blocking 'dbus-call-method "24.3")
 
 (defun dbus-call-method-asynchronously
  (bus service path interface method handler &rest args)

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 85a13a8..27cf50f 100644 (file)
--- 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
   "When non-nil, kill channel buffers when the server buffer is killed.
 Only the channel buffers associated with the server in question
 will be killed."
-  :version "24.2"
+  :version "24.3"
   :type 'boolean
   :group 'rcirc)
 

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 1ea2719..f1d54b6 100644 (file)
--- 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
 shall be given.  This is needed for remote processes."
   :group 'tramp
   :type 'string
-  :version "24.2")
+  :version "24.3")
 
 (defcustom tramp-smb-winexe-shell-command "powershell.exe"
   "Shell to be used for processes on remote machines.
 This must be Powershell V2 compatible."
   :group 'tramp
   :type 'string
-  :version "24.2")
+  :version "24.3")
 
 (defcustom tramp-smb-winexe-shell-command-switch "-file -"
   "Command switch used together with `tramp-smb-winexe-shell-command'.
 This can be used to disable echo etc."
   :group 'tramp
   :type 'string
-  :version "24.2")
+  :version "24.3")
 
 ;;;###tramp-autoload
 (defsubst tramp-smb-file-name-p (filename)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 58506ce..8485991 100644 (file)
--- 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
 a registered shell like \"rbash\".  Those hosts can be used as
 proxies only, see `tramp-default-proxies-alist'.  If the local
 host runs a registered shell, it shall be added to this list, too."
-  :version "24.2"
+  :version "24.3"
   :group 'tramp
   :type '(repeat (regexp :tag "Host regexp")))
 

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 5c8829f..a7fedf2 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -283,7 +283,7 @@ Python's PEP8 for example recommends two spaces, so you could do:
    (lambda () (set (make-local-variable 'comment-inline-offset) 2)))
 
 See `comment-padding' for whole-line comments."
-  :version "24.2"
+  :version "24.3"
   :type 'integer
   :group 'comment)
 

diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index 86b14e6..4ac9764 100644 (file)
--- 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',
 predefined for use by `nxml-glyph-set-functions'.")
 
 (define-obsolete-variable-alias 'nxml-glyph-set-hook
-  'nxml-glyph-set-functions "24.2")
+  'nxml-glyph-set-functions "24.3")
 
 (defvar nxml-glyph-set nil
   "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 d0738df..5d213d1 100644 (file)
--- a/lisp/obsolete/assoc.el
+++ b/lisp/obsolete/assoc.el
@@ -4,7 +4,7 @@
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Keywords: extensions
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index 1dd69c1..bd7d9a6 100644 (file)
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -6,7 +6,7 @@
 ;; Maintainer: FSF
 ;; Keywords: games
 ;; Created: Jan 1997
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/obsolete/cust-print.el b/lisp/obsolete/cust-print.el
index 6be200d..fc00975 100644 (file)
--- a/lisp/obsolete/cust-print.el
+++ b/lisp/obsolete/cust-print.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Adapted-By: ESR
 ;; Keywords: extensions
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;; LCD Archive Entry:
 ;; cust-print|Daniel LaLiberte|liberte@holonexus.org

diff --git a/lisp/obsolete/ledit.el b/lisp/obsolete/ledit.el
index 08e71aa..df6cb7b 100644 (file)
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -4,7 +4,7 @@
 
 ;; Maintainer: FSF
 ;; Keywords: languages
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index 158523e..b6bf0d1 100644 (file)
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -9,7 +9,7 @@
 ;; Maintainer: FSF
 ;; Created: 13 Jan 1986
 ;; Keywords: mail
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;;; Commentary:
 

diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 45396d3..8df4b36 100644 (file)
--- a/lisp/obsolete/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -4,7 +4,7 @@
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;; This file is part of GNU Emacs.
 
@@ -263,7 +263,7 @@ kill ring; mouse-1 or mouse-3 kills it."
              interprogram-paste-function
              mouse-sel-original-interprogram-paste-function))))
 
-(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.2")
+(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.3")
 
 ;;=== Internal Variables/Constants ========================================
 

diff --git a/lisp/obsolete/patcomp.el b/lisp/obsolete/patcomp.el
index b830414..9aacdd8 100644 (file)
--- a/lisp/obsolete/patcomp.el
+++ b/lisp/obsolete/patcomp.el
@@ -2,7 +2,7 @@
 
 ;; This file is part of GNU Emacs.
 
-;; Obsolete-since: 24.2
+;; Obsolete-since: 24.3
 
 ;;; Commentary:
 

diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index e637c34..f2d1618 100644 (file)
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -44,7 +44,7 @@
             (push "--nosignature" opts))))
     opts)
   "String, or list of strings, with extra options for an rpm query command."
-  :version "24.2"
+  :version "24.3"
   :type '(choice (const :tag "No options" nil)
                  (string :tag "Single option")
                  (repeat :tag "List of options" string))
@@ -52,7 +52,7 @@
 
 (defcustom pcmpl-rpm-cache t
   "Whether to cache the list of installed packages."
-  :version "24.2"
+  :version "24.3"
   :type 'boolean
   :group 'pcmpl-rpm)
 

diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index b71bfb2..d357da6 100644 (file)
--- 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."
   :group 'pcomplete)
 
 (define-obsolete-variable-alias
-  'pcomplete-arg-quote-list 'comint-file-name-quote-list "24.2")
+  'pcomplete-arg-quote-list 'comint-file-name-quote-list "24.3")
 
 (defcustom pcomplete-man-function 'man
   "A function to that will be called to display a manual page.
@@ -791,7 +791,7 @@ this is `comint-dynamic-complete-functions'."
            pcomplete-args))))))
 
 (define-obsolete-function-alias
-  'pcomplete-quote-argument #'comint-quote-filename "24.2")
+  'pcomplete-quote-argument #'comint-quote-filename "24.3")
 
 ;; file-system completion lists
 

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index c008e1c..21a323d 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -684,13 +684,13 @@ starting the compilation process."
     (t (:inverse-video t :weight bold)))
   "Face for Compilation mode's \"error\" mode line indicator."
   :group 'compilation
-  :version "24.2")
+  :version "24.3")
 
 (defface compilation-mode-line-run
   '((t :inherit compilation-warning))
   "Face for Compilation mode's \"running\" mode line indicator."
   :group 'compilation
-  :version "24.2")
+  :version "24.3")
 
 (defface compilation-mode-line-exit
   '((default :inherit compilation-info)
@@ -700,7 +700,7 @@ starting the compilation process."
     (t (:weight bold)))
   "Face for Compilation mode's \"exit\" mode line indicator."
   :group 'compilation
-  :version "24.2")
+  :version "24.3")
 
 (defface compilation-line-number
   '((t :inherit font-lock-keyword-face))

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 848b928..e13b67e 100644 (file)
--- 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."
   "Non-nil means that non-block ()-, {}- and []-groups are indented as blocks.
 The closing bracket is aligned with the line of the opening bracket,
 not the contents of the brackets."
-  :version "24.2"
+  :version "24.3"
   :type 'boolean
   :group 'perl)
 

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 90908c8..601850e 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -378,14 +378,14 @@ The type returned can be `comment', `string' or `paren'."
   (nth 8 (syntax-ppss)))
 
 (define-obsolete-function-alias
-  'python-info-ppss-context #'python-syntax-context "24.2")
+  'python-info-ppss-context #'python-syntax-context "24.3")
 
 (define-obsolete-function-alias
-  'python-info-ppss-context-type #'python-syntax-context-type "24.2")
+  'python-info-ppss-context-type #'python-syntax-context-type "24.3")
 
 (define-obsolete-function-alias
   'python-info-ppss-comment-or-string-p
-  #'python-syntax-comment-or-string-p "24.2")
+  #'python-syntax-comment-or-string-p "24.3")
 
 (defvar python-font-lock-keywords
   ;; Keywords
@@ -588,10 +588,10 @@ It makes underscores and dots word constituent chars.")
   :safe 'booleanp)
 
 (define-obsolete-variable-alias
-  'python-indent 'python-indent-offset "24.2")
+  'python-indent 'python-indent-offset "24.3")
 
 (define-obsolete-variable-alias
-  'python-guess-indent 'python-indent-guess-indent-offset "24.2")
+  'python-guess-indent 'python-indent-guess-indent-offset "24.3")
 
 (defvar python-indent-current-level 0
   "Current indentation level `python-indent-line-function' is using.")
@@ -1808,13 +1808,13 @@ there for compatibility with CEDET.")
     (get-buffer-process proc-buffer-name)))
 
 (define-obsolete-function-alias
-  'python-proc 'python-shell-internal-get-or-create-process "24.2")
+  'python-proc 'python-shell-internal-get-or-create-process "24.3")
 
 (define-obsolete-variable-alias
-  'python-buffer 'python-shell-internal-buffer "24.2")
+  'python-buffer 'python-shell-internal-buffer "24.3")
 
 (define-obsolete-variable-alias
-  'python-preoutput-result 'python-shell-internal-last-output "24.2")
+  'python-preoutput-result 'python-shell-internal-last-output "24.3")
 
 (defun python-shell-send-string (string &optional process msg)
   "Send STRING to inferior Python PROCESS.
@@ -1876,10 +1876,10 @@ Returns the output.  See `python-shell-send-string-no-output'."
          (python-shell-internal-get-or-create-process) nil)))
 
 (define-obsolete-function-alias
-  'python-send-receive 'python-shell-internal-send-string "24.2")
+  'python-send-receive 'python-shell-internal-send-string "24.3")
 
 (define-obsolete-function-alias
-  'python-send-string 'python-shell-internal-send-string "24.2")
+  'python-send-string 'python-shell-internal-send-string "24.3")
 
 (defun python-shell-send-region (start end)
   "Send the region delimited by START and END to inferior Python process."
@@ -2369,7 +2369,7 @@ the if condition."
   :safe 'booleanp)
 
 (define-obsolete-variable-alias
-  'python-use-skeletons 'python-skeleton-autoinsert "24.2")
+  'python-use-skeletons 'python-skeleton-autoinsert "24.3")
 
 (defvar python-skeleton-available '()
   "Internal list of available skeletons.")

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index a713539..a6089aa 100644 (file)
--- 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'."
   (self-insert-command (prefix-numeric-value arg))
   (or arg (sh--maybe-here-document)))
 (make-obsolete 'sh--maybe-here-document
-               'sh-electric-here-document-mode "24.2")
+               'sh-electric-here-document-mode "24.3")
 
 (defun sh--maybe-here-document ()
   (or (not (looking-back "[^<]<<"))

diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 02948b3..0234042 100644 (file)
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -80,7 +80,7 @@
 For other modes it is disabled.  If this is equal to t,
 then Which Function mode is enabled in any major mode that supports it."
   :group 'which-func
-  :version "24.2"                       ; explicit list -> t
+  :version "24.3"                       ; explicit list -> t
   :type '(choice (const :tag "All modes" t)
                 (repeat (symbol :tag "Major mode"))))
 
@@ -150,7 +150,7 @@ mouse-2: toggle rest visibility\n\
 mouse-3: go to end")
     "]")
   "Format for displaying the function in the mode line."
-  :version "24.2"                       ; added mouse-face
+  :version "24.2"                  ; added mouse-face; 24point2 is correct
   :group 'which-func
   :type 'sexp)
 ;;;###autoload (put 'which-func-format 'risky-local-variable t)

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 6310190..215314d 100644 (file)
--- 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,
          (print-level nil)
          (print-readably t)
          (print-quoted t))
-      ;; During the 24.2 development, read-passwd had a bug which resulted in
+      ;; During the 24.3 development, read-passwd had a bug which resulted in
       ;; the passwords being saved by savehist.  Trim them, retroactively.
-      ;; This code can be removed after the 24.2 release.
+      ;; This code can be removed after the 24.3 release.
       (dolist (sym savehist-minibuffer-history-variables)
         (if (and (symbolp sym) (equal (symbol-name sym) "forget-history"))
             (setq savehist-minibuffer-history-variables

diff --git a/lisp/server.el b/lisp/server.el
index a25da40..6d34df3 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -163,7 +163,7 @@ key."
   :type '(choice
          (const :tag "Random" nil)
          (string :tag "Password"))
-  :version "24.2")
+  :version "24.3")
 
 (defcustom server-raise-frame t
   "If non-nil, raise frame when switching to a buffer."

diff --git a/lisp/simple.el b/lisp/simple.el
index f644044..76243a2 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -570,7 +570,7 @@ Trailing lines are deleted only if `delete-trailing-whitespace'
 is called on the entire buffer (rather than an active region)."
   :type 'boolean
   :group 'editing
-  :version "24.2")
+  :version "24.3")
 
 (defun delete-trailing-whitespace (&optional start end)
   "Delete trailing whitespace between START and END.
@@ -2295,7 +2295,7 @@ output buffer and running a new command in the default buffer,
                 (const :tag "Rename the existing buffer"
                        rename-buffer))
   :group 'shell
-  :version "24.2")
+  :version "24.3")
 
 (defun async-shell-command (command &optional output-buffer error-buffer)
   "Execute string COMMAND asynchronously in background.

diff --git a/lisp/strokes.el b/lisp/strokes.el
index 302e441..dfd0e95 100644 (file)
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -217,7 +217,7 @@ static char * stroke_xpm[] = {
   :type 'string
   :group 'strokes)
 
-(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.2")
+(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.3")
 
 (defcustom strokes-character ?@
   "Character used when drawing strokes in the strokes buffer.

diff --git a/lisp/subr.el b/lisp/subr.el
index 04ff81e..1e367a1 100644 (file)
--- 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'."
 (define-obsolete-function-alias 'string-to-int 'string-to-number "22.1")
 
 (make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
-(make-obsolete 'buffer-has-markers-at nil "24.2")
+(make-obsolete 'buffer-has-markers-at nil "24.3")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -1194,7 +1194,7 @@ is converted into a string by expressing it in decimal."
 (set-advertised-calling-convention
  'all-completions '(string collection &optional predicate) "23.1")
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
-(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.2")
+(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
 \f
 ;;;; Obsolescence declarations for variables, and aliases.
 
@@ -2491,7 +2491,7 @@ This finishes the change group by reverting all of its changes."
 
 ;; For compatibility.
 (define-obsolete-function-alias 'redraw-modeline
-  'force-mode-line-update "24.2")
+  'force-mode-line-update "24.3")
 
 (defun force-mode-line-update (&optional all)
   "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 77dc7cc..767f8f3 100644 (file)
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -215,12 +215,12 @@ Starts with the current official version.  For developer versions
 in parentheses follows the development revision and the time stamp.")
 
 (defconst rst-package-emacs-version-alist
-  '(("1.0.0" . "24.2")
-    ("1.1.0" . "24.2")
-    ("1.2.0" . "24.2")
-    ("1.2.1" . "24.2")
-    ("1.3.0" . "24.2")
-    ("1.3.1" . "24.2")
+  '(("1.0.0" . "24.3")
+    ("1.1.0" . "24.3")
+    ("1.2.0" . "24.3")
+    ("1.2.1" . "24.3")
+    ("1.3.0" . "24.3")
+    ("1.3.1" . "24.3")
     ))
 
 (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 957003c..620a1da 100644 (file)
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1499,7 +1499,7 @@ Puts point on a blank line between them."
 (defvar latex-complete-bibtex-cache nil)
 
 (define-obsolete-function-alias 'latex-string-prefix-p
-  'string-prefix-p "24.2")
+  'string-prefix-p "24.3")
 
 (defvar bibtex-reference-key)
 (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
 OUT describes the output file and is either a %-escaped string
   or nil to indicate that there is no output file.")
 
-(define-obsolete-function-alias 'tex-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'tex-string-prefix-p 'string-prefix-p "24.3")
 
 (defun tex-guess-main-file (&optional all)
   "Find a likely `tex-main-file'.

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 46ad1da..4007d1f 100644 (file)
--- 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."
                              (concat (car x) "=" (cdr x))
                            (car x)))
                        (url-attributes urlobj) ";"))))
-(make-obsolete 'url-recreate-url-attributes nil "24.2")
+(make-obsolete 'url-recreate-url-attributes nil "24.3")
 
 ;;;###autoload
 (defun url-generic-parse-url (url)

diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index d6b94a9..fb6f8d4 100644 (file)
--- 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."
   :version "21.1"
   :group 'change-log)
 (define-obsolete-face-alias 'change-log-acknowledgement
-  'change-log-acknowledgment "24.2")
+  'change-log-acknowledgment "24.3")
 (define-obsolete-face-alias 'change-log-acknowledgement-face
   'change-log-acknowledgment "22.1")
 

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 3fa7788..c6a9371 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1902,7 +1902,7 @@ For use in `add-log-current-defun-function'."
      :background "#aa2222"))
   "Face used for removed characters shown by `diff-refine-hunk'."
   :group 'diff-mode
-  :version "24.2")
+  :version "24.3")
 
 (defface diff-refine-added
   '((default
@@ -1913,7 +1913,7 @@ For use in `add-log-current-defun-function'."
      :background "#22aa22"))
   "Face used for added characters shown by `diff-refine-hunk'."
   :group 'diff-mode
-  :version "24.2")
+  :version "24.3")
 
 (defun diff-refine-preproc ()
   (while (re-search-forward "^[+>]" nil t)

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index cc8ef4a..eee3f40 100644 (file)
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -68,7 +68,7 @@
     'ediff-setup-windows-plain))
 
 (make-obsolete 'ediff-choose-window-setup-function-automatically
-              'ediff-setup-windows-default "24.2")
+              'ediff-setup-windows-default "24.3")
 
 (defcustom ediff-window-setup-function 'ediff-setup-windows-default
   "Function called to set up windows.
@@ -102,7 +102,7 @@ provided functions are written."
                 (const :tag "Single Frame" ediff-setup-windows-plain)
                 (function :tag "Other function"))
   :group 'ediff-window
-  :version "24.2")
+  :version "24.3")
 
 ;; indicates if we are in a multiframe setup
 (ediff-defvar-local ediff-multiframe nil "")

diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 3d54bbd..fdef490 100644 (file)
--- 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."
                          (if oneline (line-end-position) (point-max))))
     (file-error nil)))
 
-(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.3")
 
 ;;;;
 ;;;; file names

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index e6b6303..babcf6f 100644 (file)
--- 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."
     (t :inverse-video t))
   "Face used for removed characters shown by `smerge-refine'."
   :group 'smerge
-  :version "24.2")
+  :version "24.3")
 
 (defface smerge-refined-added
   '((default
@@ -150,7 +150,7 @@ Used in `smerge-diff-base-mine' and related functions."
     (t :inverse-video t))
   "Face used for added characters shown by `smerge-refine'."
   :group 'smerge
-  :version "24.2")
+  :version "24.3")
 
 (easy-mmode-defmap smerge-basic-map
   `(("n" . smerge-next)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2d95b14..8702819 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2803,7 +2803,7 @@ to provide the `find-revision' operation instead."
 \f
 
 ;; These things should probably be generally available
-(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.3")
 
 (defun vc-file-tree-walk (dirname func &rest args)
   "Walk recursively through DIRNAME.