Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331)
authorKaroly Lorentey <lorentey@elte.hu>
Sat, 28 May 2005 21:04:38 +0000 (21:04 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Sat, 28 May 2005 21:04:38 +0000 (21:04 +0000)
Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-348

17 files changed:
1  2 
lisp/ChangeLog
lisp/bindings.el
lisp/faces.el
lisp/files.el
lisp/font-lock.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
src/alloc.c
src/fileio.c
src/keyboard.c
src/lisp.h
src/process.c
src/window.c
src/xdisp.c
src/xmenu.c
src/xterm.c

diff --cc lisp/ChangeLog
++2005-05-28  Nick Roberts  <nickrob@snap.net.nz>
++
++      * progmodes/gdb-ui.el (gdb-all-registers): New variable.
++      (gdb-registers-buffer, toggle-gdb-all-registers):
++      Toggle display of floating point registers.
++      (gdb-registers-mode-map): Bind SPC to toggle-gdb-all-registers.
++
++      * progmodes/gud.el (gud-goto-info): Use info. Don't use require.
++      (toggle-gud-tooltip-dereference):
++      Rename from gud-toggle-tooltip-dereference.
++
+ 2005-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * info.el (Info-goto-node): Revert autoload addition (2004-06-12).
+ 2005-05-27  Jay Belanger  <belanger@truman.edu>
+       * calc/calc-prog.el (calc-kbd-report): Remove.
+       (calc-kbd-query): Rewrite.
+ 2005-05-27  Juanma Barranquero  <lekktu@gmail.com>
+       * image.el (image-library-alist): Move to image.c.
+       (image-type-available-p): Doc fix.
+ 2005-05-27  Lute Kamstra  <lute@gnu.org>
+       * calc/calc.el (calc):
+       * outline.el (outline-1, outline-2, outline-3, outline-4)
+       (outline-5, outline-6, outline-7, outline-8):
+       * textmodes/dns-mode.el (dns-mode):
+       * textmodes/sgml-mode.el (sgml-namespace-face):
+       * textmodes/tex-mode.el (superscript, subscript, tex-math-face)
+       (tex-verbatim-face, tex-use-reftex):
+       * textmodes/texinfo.el (texinfo-heading-face):
+       Specify customization group.
+       * longlines.el: Don't require easy-mmode.
+       (longlines-visible-face): Specify customization group.
+ 2005-05-27  Kenichi Handa  <handa@m17n.org>
+       * language/cyrillic.el: Add cyrillic-iso8859-5 characters in the
+       encoding table of windows-1251.
+       * international/ucs-tables.el (ucs-set-table-for-input):
+       If translation-table-for-input of a coding system is a symbol, get
+       its translation-table property.
+       * international/code-pages.el: Don't register a coding system into
+       non-iso-charset-alist more than once.
+       (cp-make-coding-system): Likewise.
+ 2005-05-26  John Wiegley  <johnw@newartisans.com>
+       * eshell/esh-cmd.el (eshell-eval-command): If the return value of
+       `eshell-resume-eval' is wrapped in a list, it indicates that the
+       command was run asynchronously.  In that case, unwrap the value
+       before checking the delimiter value.
+       * eshell/em-cmpl.el (eshell-complete-parse-arguments): If the
+       character before a space at the end of a line is \, assume the space
+       is part of the last argument rather than a final argument separator.
+       * eshell/esh-io.el (eshell-get-target): If `eshell-buffer-shorthand'
+       is in use, and the target is `t' or `nil' (which are the most common
+       values), don't assume that the symbol target is a buffer.
+ 2005-05-26  Luc Teirlinck  <teirllm@auburn.edu>
+       * calendar/calendar.el (calendar-mode-line-format):
+       Use mode-line-highlight as mouse-face.
+       * time.el (display-time-string-forms, display-time-update):
+       Use mode-line-highlight as mouse-face.
+ 2005-05-26  Jay Belanger  <belanger@truman.edu>
+       * calc/calc.el (calc-language-alist): Remove extra defvar.
+ 2005-05-26  Lute Kamstra  <lute@gnu.org>
+       * arc-mode.el (archive-mode):
+       * bookmark.el (bookmark-read-annotation-mode)
+       (bookmark-edit-annotation-mode, bookmark-bmenu-mode):
+       * bs.el (bs-mode):
+       * calc/calc-yank.el (calc-edit-mode):
+       * calc/calc.el (calc-mode, calc-trail-mode):
+       * calculator.el (calculator-mode):
+       * chistory.el (command-history-mode):
+       * comint.el:
+       * cus-edit.el (custom-mode):
+       * descr-text.el (describe-text-mode):
+       * ebuff-menu.el (Electric-buffer-menu-mode):
+       * ediff-util.el (ediff-mode):
+       * emacs-lisp/re-builder.el (reb-mode):
+       * emulation/vi.el (vi-mode-setup):
+       * emulation/ws-mode.el (wordstar-mode):
+       * eshell/esh-mode.el (eshell-mode):
+       * forms.el (forms-mode):
+       * help-mode.el (help-mode):
+       * hexl.el (hexl-mode):
+       * ibuffer.el (ibuffer-mode):
+       * ielm.el (inferior-emacs-lisp-mode):
+       * info.el (Info-mode, Info-edit-mode):
+       * international/swedish.el:
+       * ledit.el (ledit-from-lisp-mode):
+       * locate.el (locate-mode):
+       * mail/rmail.el (rmail-mode):
+       * mail/rmailedit.el (rmail-edit-mode):
+       * mail/rmailsum.el (rmail-summary-mode):
+       * mail/supercite.el (sc-electric-mode):
+       * net/eudc.el (eudc-mode):
+       * net/quickurl.el (quickurl-list-mode):
+       * net/snmp-mode.el (snmp-mode, snmpv2-mode):
+       * obsolete/ooutline.el (outline-mode):
+       * obsolete/options.el (Edit-options-mode):
+       * obsolete/rnews.el (news-mode):
+       * obsolete/rnewspost.el (news-reply-mode):
+       * play/5x5.el (5x5-mode):
+       * play/decipher.el (decipher-mode, decipher-stats-mode):
+       * play/gomoku.el (gomoku-mode):
+       * play/snake.el (snake-mode):
+       * play/solitaire.el (solitaire-mode):
+       * play/tetris.el (tetris-mode):
+       * progmodes/ada-mode.el (ada-mode):
+       * progmodes/antlr-mode.el (antlr-mode):
+       * progmodes/autoconf.el (autoconf-mode):
+       * progmodes/dcl-mode.el (dcl-mode):
+       * progmodes/delphi.el (delphi-mode):
+       * progmodes/ebrowse.el (ebrowse-tree-mode)
+       (ebrowse-electric-list-mode, ebrowse-member-mode)
+       (ebrowse-electric-position-mode):
+       * progmodes/f90.el (f90-mode):
+       * progmodes/fortran.el (fortran-mode):
+       * progmodes/icon.el (icon-mode):
+       * progmodes/idlw-help.el (idlwave-help-mode):
+       * progmodes/idlw-shell.el (idlwave-shell-mode):
+       * progmodes/idlwave.el (idlwave-mode):
+       * progmodes/inf-lisp.el (inferior-lisp-mode):
+       * progmodes/m4-mode.el (m4-mode):
+       * progmodes/meta-mode.el (metafont-mode, metapost-mode):
+       * progmodes/modula2.el (modula-2-mode):
+       * progmodes/octave-inf.el (inferior-octave-mode):
+       * progmodes/octave-mod.el (octave-mode):
+       * progmodes/pascal.el (pascal-mode):
+       * progmodes/sh-script.el (sh-mode):
+       * progmodes/sql.el (sql-mode, sql-interactive-mode):
+       * progmodes/vhdl-mode.el (vhdl-mode):
+       * progmodes/xscheme.el (scheme-interaction-mode):
+       * replace.el (occur-mode):
+       * ses.el (ses-mode):
+       * simple.el (completion-list-mode):
+       * skeleton.el:
+       * speedbar.el (speedbar-mode):
+       * term.el (term-mode):
+       * terminal.el (terminal-edit-mode):
+       * textmodes/reftex-index.el (reftex-index-mode)
+       (reftex-index-phrases-mode):
+       * textmodes/reftex-sel.el (reftex-select-label-mode)
+       (reftex-select-bib-mode):
+       * textmodes/reftex-toc.el (reftex-toc-mode):
+       * wdired.el (wdired-change-to-wdired-mode):
+       * wid-browse.el (widget-browse-mode):
+       Use run-mode-hooks.
+       * array.el (array-mode):
+       * calendar/todo-mode.el (todo-mode):
+       * man.el (Man-mode):
+       * play/landmark.el (lm-mode):
+       * play/mpuz.el (mpuz-mode):
+       Use kill-all-local-variables and run-mode-hooks.
+       * subr.el (delay-mode-hooks): Specify indentation.
+ 2005-05-26  Mark A. Hershberger  <mah@everybody.org>
+       * xml.el (xml-substitute-special): Don't die for undefined xml entities.
+ 2005-05-26  Jay Belanger  <belanger@truman.edu>
+       * calc/calc-prog.el (calc-user-define-edit): Don't find substring
+       of nil.
+ 2005-05-27  Nick Roberts  <nickrob@snap.net.nz>
+       * progmodes/gdb-ui.el (gdb-frame-address):
+       Rename from gdb-current-address.
+       (gdb-previous-frame-address): Rename from gdb-previous-address.
+       (gdb-selected-frame): Rename from gdb-current-frame.
+       (gdb-get-selected-frame): Rename from gdb-get-current-frame.
+       (gdb-frame-number): Rename from gdb-current-stack-level.
+       (gdb-ann3): Match new mode-name for disassembly buffer.
+       Extend initialisation of variables.
+       (gdb-post-prompt): Update disassembly from gdb-frame-handler.
+       (gdb-memory-mode): Use mouse-face in header line.
+       (gdb-assembler-buffer-name): Call it disassembly and give frame
+       in mode line.
+       (gdb-source-spec-regexp, gdb-assembler-custom)
+       (gdb-invalidate-assembler, gdb-frame-handler):
+       Make robust to leading zeroes in address format.
+ 2005-05-26  Carsten Dominik  <dominik@science.uva.nl>
+       * textmodes/org.el (org-mode): Use `define-derived-mode' to
+       define `org-mode'.
+       (org-agenda-mode): Use `run-mode-hooks' instead of `run-hooks'.
+ 2005-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * log-edit.el (log-edit-changelog-entries): Distinguish between
+       filenames like xfns.c and fns.c.
+ 2005-05-25  Luc Teirlinck  <teirllm@auburn.edu>
+       * buff-menu.el (Buffer-menu-revert-function): Improve handling of
+       point after reverting.
+       (Buffer-menu-make-sort-button): Handle the case where
+       `Buffer-menu-use-header-line' is nil.
+ 2005-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
+       * vms-patch.el (vms-magic-right-square-brace, vms-magic-colon):
+       New funcs.  In minibuffer-local-completion-map bind `]', `/'
+       and `:' to them.
+ 2005-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * startup.el (normal-top-level): Allow modification of load-path while
+       we're iterating over it.
+ 2005-05-25  Juanma Barranquero  <lekktu@gmail.com>
+       * thumbs.el (thumbs-thumbsdir-max-size, thumbs-temp-file)
+       (thumbs-cleanup-thumbsdir, thumbs-call-convert)
+       (thumbs-resize-interactive, thumbs-insert-image)
+       (thumbs-insert-thumb, thumbs-dired-show-marked)
+       (thumbs-find-image-at-point, thumbs-delete-images)
+       (thumbs-rename-images, thumbs-next-image, thumbs-dired-setroot)
+       (thumbs-increment-image-size, thumbs-decrement-image-size):
+       Fix typos in docstrings.
+ 2005-05-24  Andre Spiegel  <spiegel@gnu.org>
+       * progmodes/cperl-mode.el (cperl-vc-header-alist): Obsolete.
+       (cperl-vc-rcs-header, cperl-vc-sccs-header): New user options.
+       (cperl-mode): Use them.
+ 2005-05-24  Juanma Barranquero  <lekktu@gmail.com>
+       * window.el (quit-window, shrink-window-if-larger-than-buffer):
+       Doc fixes.
+ 2005-05-24  Nick Roberts  <nickrob@snap.net.nz>
+       * progmodes/gdb-ui.el (gdb-inferior-io-mode-map):
+       Bind C-d to gdb-inferior-io-eof.
+       * dired.el (dired-dnd-popup-notice): Use message-box.
+ 2005-05-23  Masatake YAMATO  <jet@gyve.org>
+       * bindings.el (mode-line-major-mode-keymap):
+       Bind [mode-line down-mouse-1] to `mouse-major-mode-menu'.
+       * faces.el (mode-line-highlight): New face.
+       * ruler-mode.el (ruler-mode-ruler): Use mode-line-highlight
+       as mouse-face.
+       * bindings.el (top-level, help-echo, mode-line-modified)
+       (mode-line-mule-info, mode-line-eol-desc): Use mode-line-highlight
+       as mouse-face.
+ 2005-05-23  Juanma Barranquero  <lekktu@gmail.com>
+       * progmodes/cc-engine.el (c-guess-basic-syntax):
+       Remove spurious call to `zerop'.
+       * emacs-lisp/cl.el (acons, pairlis): Add docstring.
+ 2005-05-23  Martin Stjernholm  <bug-cc-mode@gnu.org>
+       CC Mode update to 5.30.10:
+       * cc-fonts.el (c-font-lock-declarators): Fix bug where the point
+       could go past the limit in decoration level 2, thereby causing
+       errors during interactive fontification.
+       * cc-mode.el (c-make-inherited-keymap): Fix cc-bytecomp bug when
+       the file is evaluated interactively.
+       * cc-engine.el (c-guess-basic-syntax): Handle operator
+       declarations somewhat better in C++.
+       * cc-styles.el, cc-mode.el (c-run-mode-hooks): New helper macro to
+       make use of `run-mode-hooks' which has been added in Emacs 21.1.
+       (c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode)
+       (awk-mode): Use it.
+       (make-local-hook): Suppress warning about obsoleteness.
+       * cc-engine.el, cc-align.el, cc-cmds.el
+       (c-append-backslashes-forward, c-delete-backslashes-forward)
+       (c-find-decl-spots, c-semi&comma-no-newlines-before-nonblanks):
+       Compensate for return value from `forward-line' when it has moved
+       but not to a different line due to eob.
+       * cc-engine.el (c-guess-basic-syntax): Fix anchoring in
+       `objc-method-intro' and `objc-method-args-cont'.
+ 2005-05-23  Alan Mackenzie  <bug-cc-mode@gnu.org>
+       CC Mode update to 5.30.10:
+       * cc-mode.el, cc-engine.el, cc-align.el: Change the FSF's address
+       in the copyright statement.  Incidentally, change "along with GNU
+       Emacs" to "along with this program" where it occurs.
+       * cc-mode.el: Add a fourth parameter `t' to the awk-mode autoload,
+       so that it is interactive, hence can be found by M-x awk-mode
+       whilst cc-mode is yet to be loaded.  Reported by Glenn Morris
+       <gmorris+emacs@ast.cam.ac.uk>.
+       * cc-awk.el: Add character classes (e.g. "[:alpha:]") into AWK
+       Mode's regexps.
+ 2005-05-23  Kevin Ryde  <user42@zip.com.au>
+       * cc-align.el (c-lineup-argcont): Ignore conses for {} pairs from
+       c-parse-state, to avoid a lisp error (on bad code).
+ 2005-05-23  Lute Kamstra  <lute@gnu.org>
+       * subr.el (font-lock-defaults): Remove defvar as it's already
+       defined in font-core.el.
+       * font-lock.el (font-lock-beginning-of-syntax-function): Fix docstring.
+ 2005-05-23  Nick Roberts  <nickrob@snap.net.nz>
+       * progmodes/gdb-ui.el (gdb-info-locals-handler): Make regexps
+       more general and work when GDB variable "print pretty" is on,
+       as with Emacs, for example.
+ 2005-05-22  Luc Teirlinck  <teirllm@auburn.edu>
+       * font-core.el: Update comment.
+       * emacs-lisp/easy-mmode.el (define-global-minor-mode):
+       Use `after-change-major-mode-hook' instead of `find-file-hook'.
+       * buff-menu.el (Buffer-menu-mode): Use `run-mode-hooks'.
+ 2005-05-22  Eli Zaretskii  <eliz@gnu.org>
+       * simple.el (yank, yank-pop): Mention `yank-excluded-properties'
+       and `yank-handler' in the doc strings.
+ 2005-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/cl.el (eql): Remove.  It's a builtin already.
+ 2005-05-22  Richard M. Stallman  <rms@gnu.org>
+       * help.el (describe-key): Move print-help-return-message call
+       out of conditional.
+       * progmodes/etags.el (list-tags): Use with-no-warnings.
+       * mail/smtpmail.el (smtpmail-open-stream): Use with-no-warnings.
+       (smtpmail-send-queued-mail): Avoid beginning-of-buffer.
+       (starttls-extra-args, starttls-extra-arguments): Add defvars.
+       * mail/mailalias.el (mail-get-names): Avoid beginning-of-buffer.
+       * language/viet-util.el (viet-viscii-nonascii-translation-table):
+       Add defvar.
+       * emulation/viper-ex.el (viper-ex-work-buf, viper-ex-print-buf):
+       Use defvar, not defconst.
+       * hexl.el (hexl-follow-line): Use with-no-warnings.
+       * emulation/tpu-extras.el: Use write-file-functions instead of
+       write-file-hooks.
+       * dired.el (dired-font-lock-keywords): Fontify files with junk
+       extensions even if marked by -F.
+ 2005-05-22  Juanma Barranquero  <lekktu@gmail.com>
+       * emacs-lisp/cl.el (pushnew, cl-macroexpand, floatp-safe, plusp)
+       (minusp, oddp, evenp, mapcar*, list*, copy-list, adjoin, subst):
+       * emacs-lisp/cl-extra.el (coerce, map, maplist, cl-mapc, mapl)
+       (mapcan, mapcon, some, every, notany, notevery, signum, isqrt)
+       (concatenate, list-length, get*, getf, cl-remprop):
+       * emacs-lisp/cl-macs.el (function*, case, ecase, typecase)
+       (etypecase, progv, lexical-let, lexical-let*)
+       (multiple-value-bind, multiple-value-setq, shiftf):
+       Improve argument/docstring consistency.
+       * subr.el (focus-frame, unfocus-frame):
+       Revert deletion on 2005-05-01.
+ 2005-05-22  Andre Spiegel  <spiegel@gnu.org>
+       * vc-cvs.el (vc-cvs-checkout-model): Handle the case where FILE
+       doesn't exist.
+       * vc.el (vc-trunk-p): Add autoload cookie.  The function is used in
+       vc-rcs.el when vc-mistrust-permissions is t, which is not the default.
+ 2005-05-22  Nick Roberts  <nickrob@snap.net.nz>
+       * emacs-lisp/bytecomp.el: Remove make-obsolete-variable for
+       already deleted variables: auto-fill-hook, blink-paren-hook,
+       lisp-indent-hook, inhibit-local-variables, unread-command-event
+       suspend-hooks, comment-indent-hook, meta-flag,
+       before-change-function, after-change-function,
+       font-lock-doc-string-face.
+ 2005-05-21  Luc Teirlinck  <teirllm@auburn.edu>
+       * emacs-lisp/derived.el (define-derived-mode): Doc fix.
+ 2005-05-21  Eli Zaretskii  <eliz@gnu.org>
+       * mail/rmail.el (rmail-reply): Filter the list in reply-to through
+       rmail-dont-reply-to.
+ 2005-05-21  Frederik Fouvry  <fouvry@CoLi.Uni-SB.DE>
+       * mail/sendmail.el (mail-send): Use [[:space:]] instead of a
+       literal blank when splitting new-header-values.
+ 2005-05-21  Matt Hodges  <MPHodges@member.fsf.org>
+       * calendar/cal-menu.el (cal-menu-update): Add separator as a
+       string so that tmm doesn't create a completion entry for it.
+       * textmodes/table.el (table-disable-menu): Ditto.
+ 2005-05-21  Richard M. Stallman  <rms@gnu.org>
+       * progmodes/idlwave.el (idlwave-doc-header): Use insert-file-contents.
+       * progmodes/flymake.el (flymake-makehash): Use with-no-warnings.
+       * net/rcompile.el (remote-compile): Use compilation-start.
+       * tmm.el (tmm-shortcut): Avoid using beginning-of-buffer.
+ 2005-05-21  Daniel Pfeiffer  <occitan@esperanto.org>
+       * files.el (auto-mode-alist): Check GNUmakefile before makefile.
+       Default to makefile-bsdmake-mode on BSD systems.
+       * imenu.el (imenu-generic-expression, imenu--generic-function'):
+       REGEXP may also be a search function now.  The part of doc-string
+       for describing the structure was 95% identical to that of
+       `imenu--generic-function'.  Unify it there.
+       * progmodes/make-mode.el (makefile-imenu-generic-expression):
+       Use function to find dependencies, because regexp alone is so complex,
+       it easily goes into an endless loop.
+       (makefile-makepp-mode): Also add submenu for Perl functions
+       defined in the makefile.
+       (makefile-bsdmake-mode): Special imenu-generic-expression no
+       longer needed, due to function call.
+       (makefile-match-dependency): Take BOUND into account when checking
+       if we're through.
+ 2005-05-20  Jay Belanger  <belanger@truman.edu>
+       * calc/calc-units.el (calc-invalidate-units-table):
+       Use inhibit-read-only.
+       (math-build-units-table-buffer): Use view-mode.
+ 2005-05-20  David Kastrup  <dak@gnu.org>
+       * emacs-lisp/easymenu.el (easy-menu-add): Correct docstring since
+       easy-menu-add is not a nop on Emacs; and clarify when to call it.
+ 2005-05-20  Lute Kamstra  <lute@gnu.org>
+       * diff-mode.el (diff-header-face, diff-file-header-face)
+       (diff-index-face, diff-hunk-header-face, diff-removed-face)
+       (diff-added-face, diff-changed-face, diff-function-face)
+       (diff-context-face, diff-nonexistent-face): Put them in the
+       diff-mode customization group.
+ 2005-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/vhdl-mode.el (vhdl-font-lock-match-item): Simplify regexp.
+       * progmodes/sh-script.el (sh-mode, sh-get-word): Minor regexp fixes.
+       * font-lock.el (lisp-font-lock-keywords-2): Don't error.
+       Minor regexp-optimization.
+ 2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
+       * textmodes/org.el (org-agenda-toggle-time-grid): New command.
+       (org-agenda-use-time-grid, org-agenda-time-grid): New options.
+       (org-agenda-add-time-grid-maybe): New function.
+       (org-agenda): Call `org-agenda-add-time-grid-maybe'.
+       (org-table-create): `dotimes' instead of `mapcar'.
+       (org-xor): Simplify implementation.
+       (org-agenda): `inhibit-redisplay' turned on.
+       (org-agenda-change-all-lines): Use `org-format-agenda-item' to get
+       a consistent line after a state change.
+       (org-agenda-remove-times-when-in-prefix): New option.
+       (org-prefix-has-time): New variable.
+       (org-parse-time-string): Optional argument NODEFAULT.
+       (org-format-agenda-item): Parse items for time-of-day
+       specifications and move these into the prefix if possible.
+       (org-agenda-priority): Get current heading, not previous heading
+       during agenda remote editing.
  2005-05-20  Juanma Barranquero  <lekktu@gmail.com>
  
+       * emacs-lisp/cl-seq.el (reduce, fill, replace, remove*)
+       (remove-if, remove-if-not, delete*, delete-if, delete-if-not)
+       (remove-duplicates, delete-duplicates, substitute)
+       (substitute-if, substitute-if-not, nsubstitute, nsubstitute-if)
+       (nsubstitute-if-not, find, find-if, find-if-not, position)
+       (position-if, position-if-not, count, count-if, count-if-not)
+       (mismatch, search, sort*, stable-sort, merge, member*)
+       (member-if, member-if-not, assoc*, assoc-if, assoc-if-not)
+       (rassoc*, rassoc-if, rassoc-if-not, union, nunion)
+       (intersection, nintersection, set-difference, nset-difference)
+       (set-exclusive-or, nset-exclusive-or, subsetp, subst-if)
+       (subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis)
+       (nsublis, tree-equal): Improve argument/docstring consistency.
        * subr.el (send-string, send-region):
        Remove obsolescence declaration.
        (window-dot, set-window-dot, read-input, show-buffer)
Simple merge
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/fileio.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
@@@ -3099,15 -3099,9 +3099,15 @@@ extern Lisp_Object next_single_char_pro
  
  /* defined in xmenu.c */
  EXFUN (Fx_popup_menu, 2);
- EXFUN (Fx_popup_dialog, 2);
+ EXFUN (Fx_popup_dialog, 3);
  extern void syms_of_xmenu P_ ((void));
  
 +/* defined in termchar.h */
 +struct tty_display_info;
 +
 +/* defined in termhooks.h */
 +struct display;
 +
  /* defined in sysdep.c */
  extern void stuff_char P_ ((char c));
  extern void init_sigio P_ ((int));
diff --cc src/process.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xmenu.c
Simple merge
diff --cc src/xterm.c
Simple merge