Merge from emacs-23

ChangeLog

@@ -3631,8 +3631,8 @@
 
 1999-10-09  Stefan Monnier  <monnier@cs.yale.edu>
 
-	* make-dist (dontcompile): look for the DONTCOMPILE variable rather
-	  than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile.
+	* make-dist (dontcompile): Look for the DONTCOMPILE variable rather
+	than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile.
 
 1999-10-09  Richard M. Stallman  <rms@gnu.org>
 
@@ -3641,7 +3641,7 @@
 
 1999-10-08  Stefan Monnier  <monnier@cs.yale.edu>
 
-	* update-subdirs: also ignore CVS subdirs.
+	* update-subdirs: Also ignore CVS subdirs.
 
 1999-10-07  Gerd Moellmann  <gerd@gnu.org>
 
@@ -6201,8 +6201,8 @@
 	src/Makefile.in is built from src/Makefile.
 
 	* Makefile.in (src/Makefile, lib-src/Makefile, oldXMenu/Makefile):
-	  If these files are out of date, simply have config.status
-	  rebuild them; don't rebuild them explicitly.
+	If these files are out of date, simply have config.status
+	rebuild them; don't rebuild them explicitly.
 
 1993-09-25  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -6397,7 +6397,7 @@
 
 1993-07-12  Frederic Pierresteguy  (F.Pierresteguy@frcl.bull.fr)
 
-	* configure.in (m68k-bull-sysv3): new config.
+	* configure.in (m68k-bull-sysv3): New config.
 
 1993-07-10  Jim Blandy  (jimb@geech.gnu.ai.mit.edu)
 
@@ -6620,7 +6620,7 @@
 
 	* make-dist: Rebuild configure if configure.in is newer.
 
-	* Makefile.in (src:, lib-src:, FRC:): force the src and lib-src
+	* Makefile.in (src:, lib-src:, FRC:): Force the src and lib-src
 	targets to be executed even if make remembers that it has already
 	satisfied FRC.
 
@@ -7120,7 +7120,7 @@
 	* make-dist: Don't distribute etc/Old files.
 
 	* GETTING.GNU.SOFTWARE, PROBLEMS: Registered into RCS with their
-	  backups.
+	backups.
 
 1993-03-20  Jim Blandy  (jimb@geech.gnu.ai.mit.edu)
 
@@ -7150,7 +7150,7 @@
 1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
 
 	* Makefile.in: Add commented-out variable settings for developer's
-	  configuration.
+	configuration.
 
 1993-03-14  Jim Blandy  (jimb@wookumz.gnu.ai.mit.edu)
 
@@ -7765,7 +7765,7 @@
 	the script.
 	* INSTALL: Doc fix.
 
-	* Makefile: brought the Makefile up to the GNU coding
+	* Makefile: Brought the Makefile up to the GNU coding
 	standards, as described in standards.text:
 	(TAGS): New name for the target which rebuilds the tags table.
 	(check): New target; doesn't do anything yet.

doc/lispref/ChangeLog

+2010-04-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nonascii.texi (Text Representations): Don't mark
+	enable-multibyte-characters as a user option.
+
+2010-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* control.texi (Handling Errors): How to re-throw a signal caught
+	by condition-case.
+
 2010-03-26  Chong Yidong  <cyd@stupidchicken.com>
 
 	* loading.texi (Hooks for Loading): Document after-load-functions.

doc/lispref/control.texi

@@ -1023,6 +1023,20 @@ error description.
 
 If @var{var} is @code{nil}, that means no variable is bound.  Then the
 error symbol and associated data are not available to the handler.
+
+@cindex rethrow a signal
+Sometimes it is necessary to re-throw a signal caught by
+@code{condition-case}, for some outer-level handler to catch.  Here's
+how to do that:
+
+@smallexample
+  (signal (car err) (cdr err))
+@end smallexample
+
+@noindent
+where @code{err} is the error description variable, the first argument
+to @code{condition-case} whose error condition you want to re-throw.
+@xref{Definition of signal}.
 @end defspec
 
 @defun error-message-string error-description
@@ -1109,6 +1123,7 @@ Here's the example at the beginning of this subsection rewritten using
 @end smallexample
 @end defmac
 
+
 @node Error Symbols
 @subsubsection Error Symbols and Condition Names
 @cindex error symbol

doc/lispref/nonascii.texi

@@ -37,7 +37,7 @@ how they are stored in strings and buffers.
 
   Emacs buffers and strings support a large repertoire of characters
 from many different scripts, allowing users to type and display text
-in most any known written language.
+in almost any known written language.
 
 @cindex character codepoint
 @cindex codespace
@@ -95,7 +95,7 @@ strings except for manipulating encoded text or binary non-text data.
 The representation for a string is determined and recorded in the string
 when the string is constructed.
 
-@defopt enable-multibyte-characters
+@defvar enable-multibyte-characters
 This variable specifies the current buffer's text representation.
 If it is non-@code{nil}, the buffer contains multibyte text; otherwise,
 it contains unibyte encoded text or binary non-text data.
@@ -105,7 +105,7 @@ You cannot set this variable directly; instead, use the function
 
 The @samp{--unibyte} command line option does its job by setting the
 default value to @code{nil} early in startup.
-@end defopt
+@end defvar
 
 @defun position-bytes position
 Buffer positions are measured in character units.  This function

etc/AUTHORS

@@ -33,8 +33,8 @@ Adrian Lanz: changed mail-source.el spam.el
 
 Adrian Robert: co-wrote ns-win.el
 and changed nsterm.m nsfns.m nsfont.m nsterm.h Makefile.in nsmenu.m
-  configure.in README config.in emacs.c font.c keyboard.c nsgui.h image.c
-  lisp.h macos.texi menu.c nsimage.m xdisp.c Info-gnustep.plist darwin.h
+  configure.in README config.in emacs.c font.c keyboard.c nsgui.h xdisp.c
+  image.c lisp.h macos.texi menu.c nsimage.m Info-gnustep.plist darwin.h
   and 83 other files
 
 Ævar Arnfjörð Bjarmason: changed rcirc.el
@@ -164,12 +164,12 @@ Andreas Leue: changed artist.el
 
 Andreas Luik: changed xfns.c xterm.c
 
-Andreas Politz: changed elp.el ido.el term.el
+Andreas Politz: changed editfns.c elp.el ido.el term.el
 
 Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el
   coding.c alloc.c process.c print.c editfns.c fileio.c fns.c dired.el
   xterm.c keyboard.c simple.el eval.c info.el buffer.c sysdep.c emacs.c
-  and 480 other files
+  and 483 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el
   nnslashdot.el gnus-util.el mm-url.el mm-uu.el url-http.el xterm.c
@@ -230,7 +230,7 @@ and changed smime.el mml-smime.el smime-ldap.el gnus-art.el gnus-sieve.el
   ldap.el message.el mm-decode.el mml-sec.el mml.el mule-conf.el
   nnimap.el nnrss.el wid-edit.el
 
-Arni Magnusson: changed ada-mode.texi
+Arni Magnusson: changed ada-mode.texi frames.texi
 
 Artem Chuprina: changed message.el
 
@@ -282,7 +282,7 @@ Benjamin Rutt: co-wrote gnus-dired.el
 and changed vc.el gnus-msg.el message.el diff-mode.el ffap.el nnimap.el
   nnmbox.el simple.el vc-cvs.el
 
-Bernhard Herzog: changed vc-hg.el
+Bernhard Herzog: changed vc-hg.el menu.c
 
 Bernt Hansen: changed org-clock.el
 
@@ -433,10 +433,10 @@ Chip Coldwell: changed font.c
 
 Chong Yidong: wrote redisplay-testsuite.el
 and co-wrote longlines.el
-and changed xdisp.c simple.el files.el display.texi files.texi
-  frames.texi keyboard.c cus-edit.el faces.el xterm.c Makefile.in
-  emacs.texi xfaces.c font.c startup.el xfns.c image.c misc.texi
-  compile.el configure.in custom.texi and 608 other files
+and changed xdisp.c simple.el files.el display.texi frames.texi
+  files.texi emacs.texi keyboard.c cus-edit.el faces.el xterm.c
+  Makefile.in xfaces.c font.c startup.el xfns.c misc.texi image.c
+  compile.el custom.texi text.texi and 633 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -557,6 +557,8 @@ and changed vc.el vc-hg.el vc-git.el Makefile.in vc-bzr.el vc-cvs.el
   emacs.c files.el term.c process.c vc-rcs.el bindings.el diff-mode.el
   lisp-mode.el and 840 other files
 
+Dan Rosenberg: changed movemail.c
+
 Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el
 
 Daniel Colascione: co-wrote js.el
@@ -905,25 +907,26 @@ Eric Knauel: changed gnus.el spam-report.el spam.el
 
 Eric M. Ludlam: wrote analyze.el args.el autoconf-edit.el bovine.el c.el
   cedet-cscope.el cedet-files.el cedet-global.el cedet-idutils.el
-  cedet-utests.el chart.el checkdoc.el compile.el cpp-root.el
+  cedet-utests.el chart.el checkdoc.el compile.el complete.el cpp-root.el
   cscope.el ctxt.el data-debug.el db-debug.el db-el.el db-file.el
   db-find.el db-global.el db-mode.el db-ref.el db-typecache.el db.el
   debug.el decorate.el dep.el dframe.el dictionary.el dired.el doc.el
-  document.el ede-grammar.el ede.el edit.el eieio-base.el eieio-comp.el
-  eieio-custom.el eieio-datadebug.el eieio-opt.el eieio-speedbar.el
-  eieio.el el.el expandproto.el extract.el ezimage.el fcn.el
-  fields.el filter.el filters.el find.el format.el fw.el gcc.el
-  getset.el global.el grep.el html.el ia-sb.el ia.el idle.el idutils.el
-  include.el insert.el inversion.el java.el javascript.el lex-spp.el
-  lex.el linux.el list.el locate.el make.el makefile-edit.el map.el
-  mode.el mru-bookmark.el pconf.el pmake.el proj-archive.el proj-aux.el
-  proj-comp.el proj-elisp.el proj-info.el proj-misc.el proj-obj.el
-  proj-prog.el proj-scheme.el proj-shared.el proj.el project-am.el
-  pulse.el refs.el sb-image.el sb.el scm.el scope.el semantic-ia-utest.el
-  semantic-tests.el semantic-utest-c.el semantic-utest.el semantic.el
-  shell.el simple.el sort.el source.el speedbar.el srecode.el srt.el
+  document.el ede-grammar.el ede-tests.el ede.el edit.el eieio-base.el
+  eieio-comp.el eieio-custom.el eieio-datadebug.el eieio-opt.el
+  eieio-speedbar.el eieio.el el.el emacs.el expandproto.el extract.el
+  ezimage.el fcn.el fields.el files.el filter.el filters.el find.el
+  format.el fw.el gcc.el getset.el global.el grep.el html.el ia-sb.el
+  ia.el idle.el idutils.el imenu.el include.el insert.el inversion.el
+  java.el javascript.el lex-spp.el lex.el linux.el list.el locate.el
+  make.el makefile-edit.el map.el mode.el mru-bookmark.el pconf.el
+  pmake.el proj-archive.el proj-aux.el proj-comp.el proj-elisp.el
+  proj-info.el proj-misc.el proj-obj.el proj-prog.el proj-scheme.el
+  proj-shared.el proj.el project-am.el pulse.el refs.el sb-image.el sb.el
+  scm.el scope.el semantic-ia-utest.el semantic-tests.el
+  semantic-utest-c.el semantic-utest.el semantic.el shell.el simple.el
+  sort.el source.el speedbar.el srecode-tests.el srecode.el srt.el
   symref.el system.el table.el tag-file.el tag-ls.el tag-write.el tag.el
-  texi.el util.el
+  test.el texi.el util.el
 and co-wrote cpp.el db-ebrowse.el util-modes.el
 and changed *.el info.el rmail.el speedbspec.el gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
@@ -999,9 +1002,9 @@ Flemming Hoejstrup Hansen: changed forms.el
 Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi
   mm-decode.el mm-util.el
 
-Francesc Rocher: changed startup.el cus-start.el gnus.el gnus.png
-  gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c xdisp.c
-  xterm.c
+Francesc Rocher: changed startup.el MORE.STUFF cus-start.el gnus.el
+  gnus.png gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c
+  xdisp.c xterm.c
 
 Francesco Potortì: wrote cmacexp.el
 and changed etags.c man.el delta.h etags.1 undigest.el Makefile.in
@@ -1130,7 +1133,7 @@ and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
   cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
   cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el
   cal-china.el emacs.texi rmailsum.el simple.el startup.el
-  and 972 other files
+  and 975 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1342,7 +1345,7 @@ and changed bytecode.c mail-extr.el subr.el
 Jan Djärv: wrote dnd.el font-setting.el x-dnd.el
 and changed gtkutil.c xterm.c xfns.c configure.in xterm.h xmenu.c
   x-win.el Makefile.in gtkutil.h keyboard.c frame.c frames.texi config.in
-  emacs.c xselect.c startup.el xresources.texi alloc.c cus-start.el
+  emacs.c xselect.c xresources.texi startup.el alloc.c cus-start.el
   xlwmenu.c process.c and 203 other files
 
 Jan Moringen: co-wrote cpp.el
@@ -1629,10 +1632,10 @@ João Cachopo: changed spam.el
 Juan León Lahoz García: wrote wdired.el
 and changed files.el perl-mode.el
 
-Juanma Barranquero: changed makefile.w32-in subr.el files.el bs.el
-  faces.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
+Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el
+  bs.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
   desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el
-  keyboard.c replace.el eval.c and 924 other files
+  keyboard.c replace.el eval.c and 930 other files
 
 Juergen Hoetzel: changed url-handlers.el
 
@@ -1729,7 +1732,7 @@ Katsumi Yamaoka: wrote canlock.el
 and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el
   mm-util.el mm-view.el rfc2047.el mml.el gnus-group.el gnus-msg.el
   gnus-util.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
-  mm-uu.el nnmail.el emacs-mime.texi nnheader.el and 107 other files
+  mm-uu.el nnmail.el emacs-mime.texi nnheader.el and 108 other files
 
 Kaveh R. Ghazi: changed delta88k.h xterm.c
 
@@ -2948,6 +2951,8 @@ Stefan Wiens: changed gnus-sum.el
 
 Steinar Bang: changed imap.el
 
+Štěpán Němec: changed subr.el vc-git.el
+
 Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi
   ediff-mult.el
 
@@ -3083,7 +3088,7 @@ Terrence Brannon: wrote landmark.el
 
 Terry Jones: wrote shadow.el
 
-Tetsurou Okazaki: changed byte-opt.el log-edit.el xterm.c
+Tetsurou Okazaki: changed Makefile.in byte-opt.el log-edit.el xterm.c
 
 Thamer Mahmoud: changed arabic.el
 
@@ -3311,7 +3316,7 @@ William Xu: changed outline.el webjump.el
 
 Wilson H. Tien: changed unexelf.c
 
-Wilson Snyder: changed verilog-mode.el
+Wilson Snyder: changed verilog-mode.el files.el
 
 Wim Nieuwenhuizen: changed TUTORIAL.nl
 
@@ -3343,7 +3348,7 @@ Yagi Tatsuya: changed gnus-art.el gnus-start.el
 Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
   macmenu.c macgui.h image.c macselect.c xdisp.c keyboard.c xterm.c
   Makefile.in emacs.c darwin.h macos.texi unexmacosx.c w32term.c alloc.c
-  configure.in dispnew.c and 82 other files
+  configure.in dispnew.c and 83 other files
 
 Yann Dirson: changed imenu.el
 

etc/NEWS.23

@@ -268,6 +268,7 @@ unaware that their mail configuration has changed.
 
 To disable this check, set compose-mail-user-agent-warnings to nil.
 
+---
 ** The default value of mail-interactive is t, since Emacs 23.1.
 (This was not announced at the time.)  It means that when sending mail,
 Emacs will wait for the process sending mail to return.  If you
@@ -464,7 +465,7 @@ mode from `auto-mode-alist' (or Fundamental mode) and `image-minor-mode'.
 
 
 * Lisp changes in Emacs 23.2
-
+---
 ** All the default-FOO variables that hold the default value of the FOO
 variable, are now declared obsolete.
 

lib-src/ChangeLog

@@ -3973,7 +3973,7 @@
 	(xmalloc, fatal, error): New functions.
 	(delete_socket, handle_signals): New functions.
 	(progname, socket_name): New variables.
-	 [HAVE_SOCKETS] (main): Call handle_signals; set the new variables.
+	[HAVE_SOCKETS] (main): Call handle_signals; set the new variables.
 
 1996-09-01  Richard Stallman  <rms@ethanol.gnu.ai.mit.edu>
 
@@ -4746,9 +4746,9 @@
 1995-01-12  Francesco Potortì  (pot@cnuce.cnr.it)
 
 	* etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Deleted.
-	(append_to_tagfile, typedefs, typedefs_and_cplusplus,
-	 constantypedefs, update, vgrind_style, no_warnings,
-	 cxref_style, cplusplus, noindentypedefs): Were int, now logical.
+	(append_to_tagfile, typedefs, typedefs_and_cplusplus)
+	(constantypedefs, update, vgrind_style, no_warnings)
+	(cxref_style, cplusplus, noindentypedefs): Were int, now logical.
 	(permit_duplicates): Was a var, now a #define.
 	(filename_lb): Was global, now local to main.
 	(main): Open the tag file when in cxref mode.
@@ -4767,8 +4767,8 @@
 	(TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Deleted.
 	(C_entries): nameb and savenameb deleted.  Use dinamic allocation.
 	(pfcnt): Deleted.  Users updated.
-	(getit, Asm_labels, Pascal_functions, L_getit, get_scheme,
-	 TEX_getit, prolog_getit): Use dinamic allocation for storing
+	(getit, Asm_labels, Pascal_functions, L_getit, get_scheme)
+	(TEX_getit, prolog_getit): Use dinamic allocation for storing
 	the tag instead of a fixed size buffer.
 
 1995-01-10  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -6693,8 +6693,8 @@
 1990-01-19  David Lawrence  (tale@cocoa-puffs)
 
 	* timer.c, getdate.y (new files) and Makefile:
-	  Sub-process support for run-at-time in timer.el.
-	  Doesn't yet work correctly for USG.
+	Sub-process support for run-at-time in timer.el.
+	Doesn't yet work correctly for USG.
 
 1990-01-10  Jim Kingdon  (kingdon@pogo)
 

lisp/ChangeLog

+2010-04-02  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members)
+	(semantic-create-imenu-directory-index): Fix typos in docstrings.
+	(semantic-imenu-goto-function): Reflow docstring.
+
 2010-04-02  Juri Linkov  <juri@jurta.org>
 
 	* ehelp.el (electric-help-orig-major-mode):
@@ -3881,7 +3887,7 @@
 	* bookmark.el: Formatting and doc fixes only:
 	(bookmark-search-delay): Shorten doc string to fit in 80 columns.
 	(bookmark-bmenu-search): Wrap to fit within 80 columns.
-	  Minor grammar and punctuation fixes in doc string.
+	Minor grammar and punctuation fixes in doc string.
 	(bookmark-read-search-input): Adjust to fit within 80 columns.
 
 2009-11-20  Tassilo Horn  <tassilo@member.fsf.org>
@@ -6636,12 +6642,12 @@
 2009-10-05  Karl Fogel  <kfogel@red-bean.com>
 
 	* bookmark.el (bookmark-handle-bookmark): If bookmark has no file,
-	  don't do anything related to relocating, just return nil.
+	don't do anything related to relocating, just return nil.
 	(bookmark-error-no-filename): New error.
 	(bookmark-default-handler): Signal `bookmark-error-no-filename' if
-	  bookmark has no file.  Don't even attempt to handle things that
-	  are not files; the whole point of custom handlers is to keep that
-	  knowledge elsewhere anyway.  Tighten some comments.
+	bookmark has no file.  Don't even attempt to handle things that
+	are not files; the whole point of custom handlers is to keep that
+	knowledge elsewhere anyway.  Tighten some comments.
 	(bookmark-file-or-variation-thereof): Remove now-unused function.
 	(bookmark-location): Doc string fix.
 	(Bug#4250)
@@ -6671,8 +6677,8 @@
 	(bookmark-relocate, bookmark-insert-location, bookmark-rename)
 	(bookmark-insert, bookmark-delete, bookmark-time-to-save-p)
 	(bookmark-edit-annotation-mode, bookmark-edit-annotation):
-	   Improve doc strings to say whether bookmark can be a string or
-	   a record or both, and make other consistency and clarity fixes.
+	Improve doc strings to say whether bookmark can be a string or
+	a record or both, and make other consistency and clarity fixes.
 	(bookmark-get-handler, bookmark--jump-via, bookmark-write-file)
 	(bookmark-default-annotation-text, bookmark-yank-word)
 	(bookmark-maybe-load-default-file, bookmark-maybe-sort-alist)
@@ -6680,12 +6686,12 @@
 	(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames)
 	(bookmark-bmenu-bookmark): Give these doc strings.
 	(bookmark-bmenu-check-position): Give this a doc string, but also
-	   add a FIXME comment about how the function may be pointless.
+	add a FIXME comment about how the function may be pointless.
 	(bookmark-default-handler): Rework doc string and change a
-	   parameter name, to clarify that this takes a bookmark record
-	   not a bookmark name.
+	parameter name, to clarify that this takes a bookmark record
+	not a bookmark name.
 	(bookmark-set): Change a parameter name to indicate its meaning,
-	   and improve the doc string a bit.
+	and improve the doc string a bit.
 	(Bug#4188)
 
 2009-10-04  Karl Fogel  <kfogel@red-bean.com>

lisp/cedet/semantic/db-find.el

@@ -774,7 +774,7 @@ Examines the variable `semanticdb-find-lost-includes'."
 		 (buffer-name))
 
       (data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*")
-      (data-debug-insert-tag-list lost "*")
+      ;; (data-debug-insert-tag-list lost "*")
       )))
 
 (defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext)

lisp/cedet/semantic/imenu.el

@@ -95,7 +95,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil."
 
 (defcustom semantic-imenu-bucketize-type-members t
   "*Non-nil if members of a type should be grouped into buckets.
-nil means to keep them in the same order.
+A nil value means to keep them in the same order.
 Overriden to nil if `semantic-imenu-bucketize-file' is nil."
   :group 'semantic-imenu
   :type 'boolean)
@@ -167,8 +167,8 @@ concoct a combination of file name, and position."
 
 (defun semantic-imenu-goto-function (name position &optional rest)
   "Move point associated with NAME to POSITION.
-Used to override function `imenu-default-goto-function' so that we can continue
-to use overlays to maintain the current position.
+Used to override function `imenu-default-goto-function' so that
+we can continue to use overlays to maintain the current position.
 Optional argument REST is some extra stuff."
   (require 'pulse)
   (if (semantic-overlay-p position)
@@ -249,7 +249,7 @@ Optional argument STREAM is an optional stream of tags used to create menus."
               'semantic-imenu-flush-fcn nil t)))
 
 (defun semantic-create-imenu-directory-index (&optional stream)
-  "Create an IMENU tag index based on all files active in semanticdb.
+  "Create an imenu tag index based on all files active in semanticdb.
 Optional argument STREAM is the stream of tags for the current buffer."
   (if (not semanticdb-current-database)
       (semantic-create-imenu-index-1 stream nil)

lisp/gnus/ChangeLog

+2010-04-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system
+	if set.
+
 2010-03-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-article-browse-html-save-cid-content): Rename from

lisp/gnus/mm-uu.el

@@ -486,9 +486,11 @@ apply the face `mm-uu-extract'."
       (if (mm-uu-pgp-signed-test)
 	  (progn
 	    (mml2015-clean-buffer)
-	    (let ((coding-system-for-write (or gnus-newsgroup-charset
+	    (let ((coding-system-for-write (or buffer-file-coding-system
+					       gnus-newsgroup-charset
 					       'iso-8859-1))
-		  (coding-system-for-read (or gnus-newsgroup-charset
+		  (coding-system-for-read (or buffer-file-coding-system
+					      gnus-newsgroup-charset
 					      'iso-8859-1)))
 	      (funcall (mml2015-clear-verify-function))))
 	(when (and mml2015-use (null (mml2015-clear-verify-function)))

lisp/ldefs-boot.el

@@ -1319,7 +1319,7 @@ Selecting operation
 
 Variables
 
- This is a brief overview of the different varaibles. For more info,
+ This is a brief overview of the different variables.  For more info,
  see the documentation for the variables (type \\[describe-variable] <variable> RET).
 
  artist-rubber-banding		Interactively do rubber-banding or not
@@ -10464,7 +10464,13 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
+<<<<<<< TREE
 ;;;;;;  "flyspell" "textmodes/flyspell.el" (19370 36541))
+||||||| BASE-REVISION
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19352 21362))
+=======
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19369 7847))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\
@@ -10786,6 +10792,7 @@ and choose the directory as the fortune-file.
 
 ;;;***
 
+<<<<<<< TREE
 ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el"
 ;;;;;;  (19375 49830))
 ;;; Generated autoloads from progmodes/gdb-mi.el
@@ -10796,6 +10803,19 @@ Non-nil means record the process input and output in `gdb-debug-log'.")
 (custom-autoload 'gdb-enable-debug "gdb-mi" t)
 
 (autoload 'gdb "gdb-mi" "\
+||||||| BASE-REVISION
+;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el"
+;;;;;;  (19352 21362))
+;;; Generated autoloads from progmodes/gdb-ui.el
+
+(autoload 'gdb "gdb-ui" "\
+=======
+;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el"
+;;;;;;  (19372 60979))
+;;; Generated autoloads from progmodes/gdb-ui.el
+
+(autoload 'gdb "gdb-ui" "\
+>>>>>>> MERGE-SOURCE
 Run gdb on program FILE in buffer *gud-FILE*.
 The directory containing FILE becomes the initial working directory
 and source-file directory for your debugger.
@@ -13649,8 +13669,16 @@ The main features of this mode are
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
+<<<<<<< TREE
 ;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19292
 ;;;;;;  15231))
+||||||| BASE-REVISION
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19352
+;;;;;;  21354))
+=======
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19355
+;;;;;;  62587))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14142,7 +14170,13 @@ Images should not be larger than specified by `max-image-size'.
 ;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
 ;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
 ;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs)
+<<<<<<< TREE
 ;;;;;;  "image-dired" "image-dired.el" (19370 36540))
+||||||| BASE-REVISION
+;;;;;;  "image-dired" "image-dired.el" (19352 21354))
+=======
+;;;;;;  "image-dired" "image-dired.el" (19367 42949))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from image-dired.el
 
 (autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\
@@ -15394,7 +15428,13 @@ by `jka-compr-installed'.
 
 ;;;***
 
+<<<<<<< TREE
 ;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19279 5151))
+||||||| BASE-REVISION
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19352 21355))
+=======
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19375 48608))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from progmodes/js.el
 
 (autoload 'js-mode "js" "\
@@ -16503,7 +16543,13 @@ The mail client is taken to be the handler of mailto URLs.
 
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
+<<<<<<< TREE
 ;;;;;;  "make-mode" "progmodes/make-mode.el" (19372 27330))
+||||||| BASE-REVISION
+;;;;;;  "make-mode" "progmodes/make-mode.el" (19352 21355))
+=======
+;;;;;;  "make-mode" "progmodes/make-mode.el" (19370 15152))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload 'makefile-mode "make-mode" "\
@@ -16735,7 +16781,13 @@ Returns non-nil if the new state is enabled.
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
+<<<<<<< TREE
 ;;;;;;  "gnus/message.el" (19370 36541))
+||||||| BASE-REVISION
+;;;;;;  "gnus/message.el" (19352 21361))
+=======
+;;;;;;  "gnus/message.el" (19374 17766))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from gnus/message.el
 
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17381,7 +17433,13 @@ Insert file contents of URL using `mm-url-program'.
 ;;;***
 
 ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
+<<<<<<< TREE
 ;;;;;;  "gnus/mm-uu.el" (19279 5150))
+||||||| BASE-REVISION
+;;;;;;  "gnus/mm-uu.el" (19352 21355))
+=======
+;;;;;;  "gnus/mm-uu.el" (19382 2266))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload 'mm-uu-dissect "mm-uu" "\
@@ -22607,8 +22665,16 @@ of master file.
 
 ;;;***
 
+<<<<<<< TREE
 ;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19370
 ;;;;;;  36541))
+||||||| BASE-REVISION
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19352
+;;;;;;  21358))
+=======
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19367
+;;;;;;  42950))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from textmodes/reftex-vars.el
 (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
 (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
@@ -22860,8 +22926,16 @@ variable.
 ;;;;;;  rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
 ;;;;;;  rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
 ;;;;;;  rmail-dont-reply-to-names rmail-user-mail-address-regexp
+<<<<<<< TREE
 ;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19370
 ;;;;;;  36541))
+||||||| BASE-REVISION
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19352
+;;;;;;  21360))
+=======
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19363
+;;;;;;  36802))
+>>>>>>> MERGE-SOURCE
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23828,7 +23902,13 @@ Semantic mode.
 ;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name