Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1021

ChangeLog

@@ -1,3 +1,9 @@
+2008-01-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in (xtensa): Match more configurations.
+
+	* configure: Regenerate.
+
 2008-01-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* configure.in: Update comment.

admin/FOR-RELEASE

@@ -36,11 +36,6 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
-** lennart.borgman@gmail.com 09 Jan 2008: ps-print-buffer-with-faces hangs
-If no printer is connected to the printer port that Emacs is printing
-to, I/O to that port hangs in the system calls. Emacs should avoid
-defaulting to a printer port that is not in use.
-
 * BUGS WAITING FOR MORE USER INPUT
 
 ** raman@users.sf.net, sep 7: Emacs 23.0.50: Segfaults in alloc.c (batch process)

configure

@@ -2785,7 +2785,7 @@ _ACEOF
   ;;
 
   ## Tensilica Xtensa Linux-based GNU system
-  xtensa-*-linux-gnu* )
+  xtensa*-*-linux-gnu* )
     machine=xtensa opsys=gnu-linux
     ;;
 

configure.in

@@ -752,7 +752,7 @@ dnl see the `changequote' comment above.
   ;;
 
   ## Tensilica Xtensa Linux-based GNU system
-  xtensa-*-linux-gnu* )
+  xtensa*-*-linux-gnu* )
     machine=xtensa opsys=gnu-linux
     ;;
 

doc/emacs/ChangeLog

@@ -1,3 +1,17 @@
+2008-01-26  Richard Stallman  <rms@gnu.org>
+
+	* maintaining.texi (Tags): Delete redundant index entry.
+
+2008-01-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* programs.texi (Imenu): Move "@cindex tags" from here...
+	* maintaining.texi (Tags): ...to here.
+
+2008-01-23  Kevin Ryde  <user42@zip.com.au>
+
+	* custom.texi (Mouse Buttons): Update elisp xref to "Click Events" on
+	click count.
+
 2008-01-21  Juanma Barranquero  <lekktu@gmail.com>
 
 	* entering.texi (Exiting): Fix typo.

doc/emacs/custom.texi

@@ -1885,7 +1885,7 @@ twice.
 types; clicks beyond the third generate additional triple-click events.
 However, the full number of clicks is recorded in the event list, so
 if you know Emacs Lisp you can distinguish if you really want to
-(@pxref{Accessing Events,,, elisp, The Emacs Lisp Reference Manual}).
+(@pxref{Click Events,,, elisp, The Emacs Lisp Reference Manual}).
 We don't recommend distinct meanings for more than three clicks, but
 sometimes it is useful for subsequent clicks to cycle through the same
 set of three meanings, so that four clicks are equivalent to one

doc/emacs/maintaining.texi

@@ -130,7 +130,7 @@ Of course, you should substitute the proper years and copyright holder.
 
 @node Tags
 @section Tags Tables
-@cindex tags table
+@cindex tag tables
 
   A @dfn{tags table} is a description of how a multi-file program is
 broken up into files.  It lists the names of the component files and the
@@ -796,9 +796,10 @@ default is to use the same setting as the value of
   It is possible to get through all the files in the tags table with a
 single invocation of @kbd{M-x tags-query-replace}.  But often it is
 useful to exit temporarily, which you can do with any input event that
-has no special query replace meaning.  You can resume the query replace
-subsequently by typing @kbd{M-,}; this command resumes the last tags
-search or replace command that you did.
+has no special query replace meaning.  You can resume the query
+replace subsequently by typing @kbd{M-,}; this command resumes the
+last tags search or replace command that you did.  For instance, to
+skip the rest of the current file, you can type @kbd{M-> M-,}.
 
   The commands in this section carry out much broader searches than the
 @code{find-tag} family.  The @code{find-tag} commands search only for

doc/emacs/programs.texi

@@ -279,7 +279,6 @@ bindings for that purpose.
 @subsection Imenu
 @cindex index of buffer definitions
 @cindex buffer definitions index
-@cindex tags
 
   The Imenu facility offers a way to find the major definitions in
 a file by name.  It is also useful in text formatter major modes,

lisp/ChangeLog

@@ -1,3 +1,40 @@
+2008-01-27  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-create-define-alist): Don't call
+	gdb-cpp-define-alist-program if file is nil (currently only
+	" *partial-output-...").
+
+2008-01-27  Richard Stallman  <rms@gnu.org>
+
+	* allout.el: Many doc fixes.
+	(allout-encrypt-string): Fix error message.
+
+2008-01-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* progmodes/etags.el (tags-query-replace): Doc fix.
+
+2008-01-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* allout.el (allout-unload-function): New function.
+
+2008-01-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* allout.el (allout-prefix-data): Doc fix.
+	(allout-show-current-subtree): Reflow docstring.
+	(allout-use-mode-specific-leader, allout-use-hanging-indents)
+	(produce-allout-mode-map, allout-overlay-interior-modification-handler)
+	(allout-next-heading, allout-previous-heading, allout-rebullet-heading)
+	(allout-rebullet-topic, allout-rebullet-topic-grunt, allout-kill-topic)
+	(allout-copy-topic-as-kill, allout-listify-exposed)
+	(allout-process-exposed, allout-encrypted-key-info)
+	(allout-update-passphrase-mnemonic-aids)
+	(allout-next-topic-pending-encryption)
+	(allout-tests-globally-true): Fix typos in docstrings.
+
+2008-01-23  Jason Rumney  <jasonr@gnu.org>
+
+	* lpr.el (printer-name): Do not set on MS Windows.
+
 2008-01-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-handle-shell-command): Use "/bin/sh -c" for

lisp/lpr.el

@@ -47,7 +47,7 @@
 
 ;;;###autoload
 (defcustom printer-name
-  (and lpr-windows-system "PRN")
+  (and (memq system-type '(emx ms-dos)) "PRN")
   "*The name of a local printer to which data is sent for printing.
 \(Note that PostScript files are sent to `ps-printer-name', which see.\)
 

lisp/progmodes/etags.el

@@ -1820,8 +1820,11 @@ See documentation of variable `tags-file-name'."
 Third arg DELIMITED (prefix arg) means replace only word-delimited matches.
 If you exit (\\[keyboard-quit], RET or q), you can resume the query replace
 with the command \\[tags-loop-continue].
+Fourth arg FILE-LIST-FORM non-nil means initialize the replacement loop.
+Fifth and sixth arguments START and END are accepted, for compatibility
+with `query-replace-regexp', and ignored.
 
-See documentation of variable `tags-file-name'."
+See also documentation of the variable `tags-file-name'."
   (interactive (query-replace-read-args "Tags query replace (regexp)" t t))
   (setq tags-loop-scan `(let ,(unless (equal from (downcase from))
 				'((case-fold-search nil)))

lisp/progmodes/gdb-ui.el

@@ -435,11 +435,11 @@ otherwise do not."
 	 (output
 	  (with-output-to-string
 	    (with-current-buffer standard-output
-	      (call-process shell-file-name
-			    (if (file-exists-p file) file nil)
+	      (and file (file-exists-p file)
+	      (call-process shell-file-name file
 			    (list t nil) nil "-c"
 			    (concat gdb-cpp-define-alist-program " "
-				    gdb-cpp-define-alist-flags)))))
+				    gdb-cpp-define-alist-flags))))))
 	(define-list (split-string output "\n" t)) (name))
     (setq gdb-define-alist nil)
     (dolist (define define-list)