4 files changed, 18 insertions, 17 deletions

diff --git a/README b/README
index cc8d49593d0..3304c9e4b5a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory tree holds version 21.2.94 of GNU Emacs, the extensible,
+This directory tree holds version 21.2.95 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 You may encounter bugs in this release.  If you do, please report
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index 4c2b1d69622..5c201fafec4 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -870,8 +870,8 @@ Keymap summary
 
 ;;;***
 
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (14804
-;;;;;;  20134))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (15927
+;;;;;;  36083))
 ;;; Generated autoloads from progmodes/asm-mode.el
 
 (autoload (quote asm-mode) "asm-mode" "\
@@ -1996,8 +1996,8 @@ from the cursor position." t nil)
 
 ;;;***
 
-;;;### (autoloads (calculator) "calculator" "calculator.el" (15611
-;;;;;;  31342))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (15927
+;;;;;;  36082))
 ;;; Generated autoloads from calculator.el
 
 (autoload (quote calculator) "calculator" "\
@@ -2022,7 +2022,7 @@ See the documentation for `calculator-mode' for more information." t nil)
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
 ;;;;;;  number-of-diary-entries view-diary-entries-initially calendar-offset
 ;;;;;;  calendar-week-start-day) "calendar" "calendar/calendar.el"
-;;;;;;  (15611 31353))
+;;;;;;  (15927 36082))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-week-start-day 0 "\
@@ -2606,7 +2606,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (15832 54465))
+;;;;;;  "progmodes/cc-styles.el" (15927 36083))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload (quote c-set-style) "cc-styles" "\
@@ -2647,7 +2647,7 @@ and exists only for compatibility reasons." t nil)
 
 ;;;***
 
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (15611 31358))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (15927 36083))
 ;;; Generated autoloads from progmodes/cc-vars.el
 
 (defconst c-emacs-features (let ((infodock-p (boundp (quote infodock-version))) (comments (let ((table (copy-syntax-table)) entry) (modify-syntax-entry 97 ". 12345678" table) (cond ((arrayp table) (setq entry (aref table 97)) (if (consp entry) (setq entry (car entry)))) ((fboundp (quote get-char-table)) (setq entry (get-char-table 97 table))) ((and (fboundp (quote char-table-p)) (char-table-p table)) (setq entry (car (char-table-range table [97])))) (t (error "CC Mode is incompatible with this version of Emacs"))) (if (= (logand (lsh entry -16) 255) 255) (quote 8-bit) (quote 1-bit))))) (if infodock-p (list comments (quote infodock)) (list comments))) "\
@@ -3470,7 +3470,7 @@ Enable dynamic word-completion." t nil)
 ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after
 ;;;;;;  find-composition compose-chars decompose-string compose-string
 ;;;;;;  decompose-region compose-region) "composite" "composite.el"
-;;;;;;  (15186 41418))
+;;;;;;  (15927 44373))
 ;;; Generated autoloads from composite.el
 
 (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\
@@ -3650,11 +3650,12 @@ after a sequence character events." t nil)
 
 (autoload (quote decompose-composite-char) "composite" "\
 Convert CHAR to string.
-This is only for backward compatibility with Emacs 20.4 and the earlier.
+This is only for backward compatibility with Emacs 20.4 and earlier.
 
 If optional 2nd arg TYPE is non-nil, it is `string', `list', or
-`vector'.  In this case, CHAR is converted string, list of CHAR, or
-vector of CHAR respectively." nil nil)
+`vector'.  In this case, CHAR is converted to string, list of CHAR, or
+vector of CHAR respectively.
+Optional 3rd arg WITH-COMPOSITION-RULE is ignored." nil nil)
 
 ;;;***
 
@@ -3697,7 +3698,7 @@ Insert a copyright by $ORGANIZATION notice at cursor." t nil)
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (15915 55171))
+;;;;;;  (15927 36083))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -5525,7 +5526,7 @@ It returns the old style symbol." t nil)
 ;;;;;;  ebrowse-back-in-position-stack ebrowse-tags-search-member-use
 ;;;;;;  ebrowse-tags-query-replace ebrowse-tags-loop-continue ebrowse-tags-complete-symbol
 ;;;;;;  ebrowse-electric-choose-tree ebrowse-tree-mode) "ebrowse"
-;;;;;;  "progmodes/ebrowse.el" (15797 2282))
+;;;;;;  "progmodes/ebrowse.el" (15927 36084))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -15712,7 +15713,7 @@ The default comes from `process-coding-system-alist' and
 ;;;;;;  strokes-help strokes-describe-stroke strokes-do-complex-stroke
 ;;;;;;  strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke
 ;;;;;;  strokes-global-set-stroke strokes-mode) "strokes" "strokes.el"
-;;;;;;  (15611 31352))
+;;;;;;  (15927 36082))
 ;;; Generated autoloads from strokes.el
 
 (defvar strokes-mode nil "\
diff --git a/lisp/version.el b/lisp/version.el
index 6e99bdb0f81..449616af68b 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(defconst emacs-version "21.2.94" "\
+(defconst emacs-version "21.2.95" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
diff --git a/man/emacs.texi b/man/emacs.texi
index 16086859a60..ffbd3768a67 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -8,7 +8,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
-@set EMACSVER  21.2.94
+@set EMACSVER  21.2.95
 
 @ifnottex
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},