Merge changes from emacs-23 branch.

20 files changed, 71 insertions, 56 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b667813c959..9909bf1dc5c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-14  Kenichi Handa  <handa@m17n.org>
+
+	* mail/rmail.el (rmail-show-message-1): Catch an error of
+	base64-decode-region and just show an error message (bug#7165).
+
+	* ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used
+	anymore.
+	(ps-mule-begin-job): Fix for the case that only ENCODING is set in
+	a font-spec (bug#7197).
+
+2010-10-14  Glenn Morris  <rgm@gnu.org>
+
+	* mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org.
+
+2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* international/mule.el (define-coding-system):
+	* international/titdic-cnv.el (quail-cxterm-package-ext-info):
+	* composite.el (compose-region): Fix typo in docstring.
+
 2010-10-14  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cus-face.el (custom-theme-set-faces): Call custom-push-theme
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index b33b6c62532..6855c935746 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -574,7 +574,7 @@
 
 1986-01-10  Richard Mlynarik  (mly@prep)
 
-	* mail-utils.el (mail-fetch-field)
+	* mail-utils.el (mail-fetch-field):
 	regexp-quote the argument.
 
 1986-01-10  Richard M. Stallman  (rms@prep)
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 2e96063eb81..c68d02bc3d2 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1043,10 +1043,10 @@
 	(quail-prev-translation-block): Likewise.
 	(quail-conversion-backward-char): Call quail-error instead of
 	error.  Set quail-translating to nil.
-	(quail-conversion-forward-char): Likewize.
+	(quail-conversion-forward-char): Likewise.
 	(quail-conversion-delete-char): Call quail-error instead of error.
 	If conversion region gets vacant, set quail-converting to nil.
-	(quail-conversion-backward-delete-char): Likewize.
+	(quail-conversion-backward-delete-char): Likewise.
 	(quail-no-conversion): Just set quail-converting to nil.
 	(quail-mouse-choose-completion): Call quai-error instead of error.
 	(quail-choose-completion-string): Likewise.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 82f11450a7b..6127667ac7e 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -4926,7 +4926,7 @@
 
 	* language/ethio-util.el (setup-ethiopic-environment-internal):
 	Use quail-activate-hook instead of obsolete hook quail-mode-hook.
-	(exit-ethiopic-environment): Likewize.
+	(exit-ethiopic-environment): Likewise.
 
 1999-06-12  Richard M. Stallman  <rms@gnu.org>
 
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 344ec373e75..416066885b1 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -16606,7 +16606,7 @@
 	0.  Give correct argument to set-auto-coding-function.
 	(tar-expunge): For goto-char, use (point-min), not 0.
 	(tar-clear-modification-flags): For goto-char, use (point-min), not 1.
-	(tar-subfile-save-buffer): Likewize.
+	(tar-subfile-save-buffer): Likewise.
 
 	* international/mule.el
 	(after-insert-file-set-buffer-file-coding-system): Call
@@ -16910,7 +16910,7 @@
 	(ccl-decode-viscii): Use translate-character.
 	(ccl-encode-viscii, ccl-encode-viscii-font)
 	(ccl-decode-vscii, ccl-encode-vscii, ccl-encode-vscii-font):
-	Likewize.
+	Likewise.
 
 	* language/cyrillic.el: Remove eval-when-compile.
 	(cyrillic-koi8-r-nonascii-translation-table): Define it as a
@@ -16925,7 +16925,7 @@
 	table made from the reverse map of above.
 	(ccl-decode-alternativnyj): Use translate-character.
 	(ccl-encode-alternativnyj, ccl-encode-alternativnyj-font):
-	Likewize
+	Likewise.
 
 	* international/mule-diag.el (non-iso-charset-alist): Specify
 	translation table symbol instead of translation table itself.
@@ -18071,8 +18071,8 @@
 
 	* emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg
 	list in doc string.  Don't quote keyword symbols.
-	* emacs-lisp/cl.el: Likewise
-	* emacs-lisp/cl-seq.el: Likewise
+	* emacs-lisp/cl.el: Likewise.
+	* emacs-lisp/cl-seq.el: Likewise.
 
 2000-05-05  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index c2bfe1872a2..4da210682f8 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -452,7 +452,7 @@ Do this by extracting the lowest directory name."
 ;; Targets and projects are often associated with other files, such as
 ;; header files, documentation files and the like.  Have strong
 ;; associations can make useful user commands to quickly navigate
-;; between the files base on their associations.
+;; between the files based on their associations.
 ;;
 (defun ede-header-file ()
   "Return the header file for the current buffer.
diff --git a/lisp/composite.el b/lisp/composite.el
index 16709a025e2..02c78580fff 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -213,7 +213,7 @@ of the text in the region.
 
 If it is a string, the elements are alternate characters.  In
 this case, TAB element has a special meaning.  If the first
-characer is TAB, the glyphs are displayed with left padding space
+character is TAB, the glyphs are displayed with left padding space
 so that no pixel overlaps with the previous column.  If the last
 character is TAB, the glyphs are displayed with right padding
 space so that no pixel overlaps with the following column.
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 8447d3f05c0..0b4043b1f2a 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -384,7 +384,7 @@
 	       (eq 'lambda (car-safe fn)))
 	   (let ((newform (byte-compile-unfold-lambda form)))
 	     (if (eq newform form)
-		 ;; Some error occured, avoid infinite recursion
+		 ;; Some error occurred, avoid infinite recursion
 		 form
 	       (byte-optimize-form-code-walker newform for-effect))))
 	  ((memq fn '(let let*))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 8b248db0808..81bdf5446ec 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
+
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* erc-list.el (erc-list-menu-mode-map): Declare and define in one step.
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 403be5f720e..8d900e8291e 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -56,7 +56,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this."
      (erc-current-nick) " XDCC send #\" to get a particular file number."))
   "*Help text sent in response to XDCC help command.
 A list of messages, each consisting of strings and expressions, expressions
-being evaluated and should return stings."
+being evaluated and should return strings."
   :group 'erc-dcc
   :type '(repeat (repeat :tag "Message" (choice string sexp))))
 
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 140df493b7c..89405278bea 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5550,7 +5550,7 @@
 
 	* gnus-audio.el (gnus-audio-au-player): Use executable-find.
 
-2003-01-13  Jhair Tocancipa Triana  <jhair_tocancipa@@gmx.net>
+2003-01-13  Jhair Tocancipa Triana  <jhair_tocancipa@gmx.net>
 
 	* gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use
 	/usr/bin/play as default player.
@@ -12167,7 +12167,7 @@
 2001-12-05 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-group.el (gnus-group-find-new-groups): Fix doc.
-	From:  Stefan Monnier  <monnier@cs.yale.edu>
+	From: Stefan Monnier  <monnier@cs.yale.edu>
 
 2001-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -14682,7 +14682,7 @@
 	* gnus-eform.el (gnus-edit-form-done): Return nil if end-of-file.
 
 2001-07-16 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-	From:  Stefan Monnier  <monnier@cs.yale.edu>
+	From: Stefan Monnier  <monnier@cs.yale.edu>
 
 	* message.el (message-mode): Use define-derived-mode.
 	(message-tab): message-completion-alist.
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 09510cd8b00..4dc54859ec5 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1437,7 +1437,7 @@ OPERATOR :=
 	;; Normal arithmethic operators (same meaning as C code).
 	+ | - | * | / | %
 
-	;; Bitwize operators (same meaning as C code)
+	;; Bitwise operators (same meaning as C code)
 	| & | `|' | ^
 
 	;; Shifting operators (same meaning as C code)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 753b1ab25e7..07557aacc88 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -700,7 +700,7 @@ Internal use only.  Should be called at startup time."
 ;; "HP-Hebrew8"                                    [36]
 ;;         HPHEBREW8 8-bit character set
 ;; "HP-Japanese15"                                 [36]
-;;         HPJAPAN15 15-bit characer set,
+;;         HPJAPAN15 15-bit character set,
 ;;         modified from industry defacto
 ;;         standard Shift-JIS
 ;; "HP-Kana8"                                      [36]
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 151373e27ea..df362d96c07 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -646,7 +646,7 @@ VALUE must be a function to call after all functions in
 `write-region-annotate-functions' and `buffer-file-format' are
 called, and before the text is encoded by the coding system
 itself.  This function should convert the whole text in the
-current buffer.  For backward compatibility, this funciton is
+current buffer.  For backward compatibility, this function is
 passed two arguments which can be ignored.
 
 `:default-char'
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index afe5dda1f57..92b4251b49c 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -108,7 +108,7 @@ For double-width GB2312 characters correponding to ASCII, use the
 input method `chinese-qj'.")
 
     ("chinese-ecdict" "$(05CKH(B"
-"In this input method, you enter a Chinese (Big5) charactere or word
+"In this input method, you enter a Chinese (Big5) character or word
 by typing the corresponding English word.  For example, if you type
 \"computer\", \"$(0IZH+(B\" is input.
 
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 4dba41e0655..f19143228c5 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -637,7 +637,7 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data."
 	    ;; They tend to be bogus on non-UNIX platforms anyway so
 	    ;; optionally hide them.
 	    (if (memq 'uid ls-lisp-verbosity)
-		;; uid can be a sting or an integer
+		;; uid can be a string or an integer
 		(let ((uid (nth 2 file-attr)))
                   (format (if (stringp uid)
 			      ls-lisp-uid-s-fmt
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index b3ec3fb4850..d84e60fb604 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -173,9 +173,9 @@ Prompts for bug subject.  Leaves you in a mail buffer."
         (overlay-put (make-overlay pos (point)) 'face 'highlight))
       (insert " if possible, because the Emacs maintainers
 usually do not have translators to read other languages for them.\n\n")
-      (insert (format "Your bug report will be posted to the %s mailing list"
+      (insert (format "Your report will be posted to the %s mailing list"
 		      report-emacs-bug-address))
-	(insert ",\nand to the gnu.emacs.bug news group.\n\n"))
+      (insert "\nand the gnu.emacs.bug news group, and at http://debbugs.gnu.org.\n\n"))
 
     (insert "Please describe exactly what actions triggered the bug\n"
 	    "and the precise symptoms of the bug.  If you can, give\n"
@@ -377,5 +377,4 @@ and send the mail again%s."
 
 (provide 'emacsbug)
 
-;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
 ;;; emacsbug.el ends here
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a8763b4457f..47e52f27aa1 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2742,7 +2742,9 @@ The current mail message becomes the message displayed."
 						 nil t 'unibyte)
 		  (message "Malformed MIME quoted-printable message")))
 	     ((and (string= character-coding "base64") is-text-message)
-	      (base64-decode-region (point-min) (point-max)))
+	      (condition-case err
+		  (base64-decode-region (point-min) (point-max))
+		(error (message "%s" (cdr err)))))
 	     ((eq character-coding 'uuencode)
 	      (error "uuencoded messages are not supported yet"))
 	     (t))
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index df779fde39d..95a982f29a2 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -320,31 +320,19 @@ by `ps-font-family' and `ps-header-font-family'.
 
 See also `ps-mule-font-info-database-bdf'.")
 
-(defvar ps-mule-font-spec-list nil
-  "Array of FONT-SPEC lists for each font type.
-
-Elements are for `normal' font, `bold' font, `italic' font, and
-`bold-italic' font in this order.
-
-Each element is a list of FONT-SPEC which has this form:
-
-	(ID CHARSET (FONT-SRC FONT-NAME ENCODING) EXTRA-DATA)
-
-Where
-
-ID is a number for this FONT-SPEC and is unique in the list.
-
-CHARSET, FONT-SRC, FONT-NAME, ENCODING are the same as those in
-`ps-mule-font-info-database' (which see).
-
-EXTRA-DATA is a data attached by external libraries.
-
-Each list is ordered by the current charset priorities.
-
-This variable is setup by `ps-mule-begin-job' from
-`ps-mule-font-info-database'.")
-
 ;; Functions to access each element of FONT-SPEC.
+;;
+;; FONT-SPEC is a vector of this form:
+;; 	[ID CHARSET FONT-ID FONT-SRC FONT-NAME ENCODING BYTES EXTRA-DATA]
+;; Where
+;;
+;; ID is an identification number for this FONT-SPEC and is unique in the list.
+;;
+;; CHARSET, FONT-SRC, FONT-NAME, ENCODING, and BYTES are the same as those in
+;; `ps-mule-font-info-database' (which see).
+;;
+;; EXTRA-DATA is a data attached by external libraries.
+
 (defsubst ps-mule-font-spec-id (font-spec) (aref font-spec 0))
 (defsubst ps-mule-font-spec-charset (font-spec) (aref font-spec 1))
 (defsubst ps-mule-font-spec-font-id (font-spec) (aref font-spec 2))
@@ -1044,7 +1032,7 @@ It checks if all multi-byte characters in the region are printable or not."
   (if (and (not (find-composition from to))
 	   (save-excursion
 	     (goto-char from)
-	     (= (skip-chars-forward "\x00-\xFF" to) to)))
+	     (= (skip-chars-forward "\x00-\x7F" to) to)))
       ;; All characters can be printed by normal PostScript fonts.
       (setq ps-basic-plot-string-function 'ps-basic-plot-string
 	    ps-encode-header-string-function 'identity)
@@ -1086,17 +1074,19 @@ It checks if all multi-byte characters in the region are printable or not."
 	      (setq font-info-list (cons font-info font-info-list))))
 	(setq font-info-list (nreverse font-info-list)))
 
+      ;; Now font-info-list is an alist ordered by charset priority.
       ;; Store FONT-SPECs in each element of font-spec-alist.
       (dolist (font-info font-info-list)
 	(let ((font-spec-vec (make-vector 4 nil))
 	      (charset (car font-info))
-	      encoding font-spec)
+	      encoding bytes font-spec)
 	  (dolist (e (cdr font-info))
-	    (setq encoding (or (nth 3 e) charset)
-		  font-spec (vector id-max charset font-id
+	    (setq encoding (nth 3 e) bytes (nth 4 e))
+	    (unless encoding
+	      (setq encoding charset bytes (charset-dimension charset)))
+	    (setq font-spec (vector id-max charset font-id
 				    (nth 1 e) (nth 2 e) encoding
-				    (or (nth 4 e) (charset-dimension encoding))
-				    nil)
+				    (or bytes 1) nil)
 		  id-max (1+ id-max))
 	    (if (ps-mule-check-font font-spec)
 		(aset font-spec-vec
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 02e43ef3f0c..c9036a313cb 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6656,7 +6656,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "d2fcad95db7404989362657faf744796")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "26f1d5db9476d0e84ab55627fbb72b1b")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\