Merged from miles@gnu.org--gnu-2005 (patch 28-30, 126-128)

Patches applied:

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

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

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

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

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

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

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

21 files changed, 224 insertions, 89 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 55e500bcb28..72269d5533b 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -195,7 +195,7 @@ man/display.texi    "Luc Teirlinck"  Chong Yidong
 man/emacs.texi      "Luc Teirlinck"
 man/entering.texi   "Luc Teirlinck"  Chong Yidong
 man/files.texi      "Luc Teirlinck"  Chong Yidong
-man/fixit.texi      "Luc Teirlinck"
+man/fixit.texi      "Luc Teirlinck"  Chong Yidong
 man/frames.texi     "Luc Teirlinck"  Chong Yidong
 man/glossary.texi
 man/help.texi       "Luc Teirlinck"  Chong Yidong
@@ -205,17 +205,17 @@ man/kmacro.texi     "Luc Teirlinck"  Chong Yidong
 man/macos.texi
 man/maintaining.texi
 man/major.texi      "Luc Teirlinck"  Chong Yidong
-man/mark.texi       "Luc Teirlinck"
-man/mini.texi       "Luc Teirlinck"
+man/mark.texi       "Luc Teirlinck"  Chong Yidong
+man/mini.texi       "Luc Teirlinck"  Chong Yidong
 man/misc.texi
 man/msdog.texi      Chong Yidong
 man/mule.texi       "Luc Teirlinck"
-man/m-x.texi        "Luc Teirlinck"
+man/m-x.texi        "Luc Teirlinck"  Chong Yidong
 man/picture.texi    Joakim Verona <joakim@verona.se>
 man/programs.texi   "Stephen Eglen"  Chong Yidong
 man/regs.texi       "Luc Teirlinck"   Chong Yidong
 man/rmail.texi
-man/screen.texi     "Luc Teirlinck"
+man/screen.texi     "Luc Teirlinck"  Chong Yidong
 man/search.texi     "Luc Teirlinck"
 man/sending.texi
 man/text.texi       "Luc Teirlinck"   Chong Yidong
@@ -235,7 +235,7 @@ SECTION                  READERS
 lispref/abbrevs.texi     "Luc Teirlinck"
 lispref/advice.texi      Joakim Verona <joakim@verona.se>
 lispref/anti.texi
-lispref/backups.texi     "Luc Teirlinck"
+lispref/backups.texi     "Luc Teirlinck"  Chong Yidong
 lispref/buffers.texi     "Luc Teirlinck"   Chong Yidong
 lispref/calendar.texi    Joakim Verona <joakim@verona.se>
 lispref/commands.texi    "Luc Teirlinck"
@@ -268,17 +268,17 @@ lispref/modes.texi	 Chong Yidong
 lispref/nonascii.texi    "Luc Teirlinck"
 lispref/numbers.texi     "Luc Teirlinck"   Chong Yidong
 lispref/objects.texi     "Luc Teirlinck"   Chong Yidong
-lispref/os.texi          "Luc Teirlinck"
+lispref/os.texi          "Luc Teirlinck"   Chong Yidong
 lispref/positions.texi   "Luc Teirlinck"   Chong Yidong
 lispref/processes.texi
 lispref/searching.texi   "Luc Teirlinck"
-lispref/sequences.texi   "Luc Teirlinck"
+lispref/sequences.texi   "Luc Teirlinck"   Chong Yidong
 lispref/streams.texi     "Luc Teirlinck"   Chong Yidong
 lispref/strings.texi     "Luc Teirlinck"   Chong Yidong
 lispref/symbols.texi     "Luc Teirlinck"   Chong Yidong
-lispref/syntax.texi      "Luc Teirlinck"
+lispref/syntax.texi      "Luc Teirlinck"   Chong Yidong
 lispref/text.texi        Chong Yidong
-lispref/tips.texi        "Luc Teirlinck"
+lispref/tips.texi        "Luc Teirlinck"   Chong Yidong
 lispref/variables.texi   "Luc Teirlinck"   Chong Yidong
 lispref/windows.texi     "Luc Teirlinck"   Chong Yidong
 
diff --git a/etc/NEWS b/etc/NEWS
index b4c65a77a9a..3e71209d05c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -699,8 +699,10 @@ multiple files, and C-x d passes it to `dired'.
 *** A numeric prefix argument of `info' selects an Info buffer
 with the number appended to the *info* buffer name (e.g. "*info*<2>").
 
-*** Regexp isearch (C-M-s and C-M-r) can search through multiple nodes.
-Failed isearch wraps to the top/final node.
+*** isearch in Info uses Info-search and searches through multiple nodes.
+Failed isearch wraps to the top/final node.  The user option
+`Info-isearch-search' controls whether to use Info-search or the
+default isearch search function.
 
 *** New search commands: `Info-search-case-sensitively' (bound to S),
 `Info-search-backward', and `Info-search-next' which repeats the last
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ada6badaee8..7d48d8704eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,54 @@
+2005-02-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * frame.el (blink-cursor-mode): Add :group keyword.
+
+2005-02-24  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar--decode-isodatetime): New
+        optional argument DAY-SHIFT.
+        (icalendar-export-region): Fix coding-system-for-write.
+        (icalendar--convert-ical-to-diary): Shift end-day of all-day
+        events by one.
+
+2005-02-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/tex-mode.el (tex-font-lock-keywords-3): #n is atomic.
+
+2005-02-24  Kim F. Storm  <storm@cua.dk>
+
+        * international/iso-acc.el (iso-accents-compose): Fix crash
+        during redisplay.  Call force-window-update after read-event
+        and delete-region to signal that window is not accurate.
+
+2005-02-23  Richard M. Stallman  <rms@gnu.org>
+
+        * calendar/appt.el (appt-time-msg-list): 3rd elt of each
+        appointment says it was explicitly made.
+        (appt-add): Set the 3rd element.
+        (appt-make-list): Preserve explicit appointments.
+
+        * subr.el (find-tag-default): Catch errors in forward-sexp.
+
+2005-02-23  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-isearch-search): New defcustom.
+        (Info-isearch-search): Call the default isearch function
+        when Info-isearch-search is nil.
+        (Info-isearch-wrap): Use variable Info-isearch-search.
+
 2005-02-22  Luc Teirlinck  <teirllm@auburn.edu>
 
         * cus-edit.el: Comment change.
 
 2005-02-22  Kim F. Storm  <storm@cua.dk>
 
-        * progmodes/hideif.el (hide-ifdef-use-define-alist): Use
-        completing-read.  Suggested by Juan-Leon Lahoz Garcia.
+        * progmodes/hideif.el (hide-ifdef-use-define-alist):
+        Use completing-read.  Suggested by Juan-Leon Lahoz Garcia.
 
 2005-02-22  Simon Josefsson  <jas@extundo.com>
 
-        * net/browse-url.el (browse-url-netscape-new-window-is-tab): New
-        variable.
+        * net/browse-url.el (browse-url-netscape-new-window-is-tab):
+        New variable.
         (browse-url-netscape): Use it.  Suggested by "Johann 'Myrkraverk'
         Oskarsson" <myrkraverk@users.sourceforget.net>.
 
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index e6ff2868592..e11129414d3 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -189,9 +189,11 @@ Only relevant if reminders are being displayed in a window."
 Use `appt-add' and `appt-delete' to add and delete appointments.
 The original list is generated from today's `diary-entries-list', and
 can be regenerated using the function `appt-check'.
-Each element of the generated list has the form (MINUTES) STRING; where
+Each element of the generated list has the form (MINUTES STRING [FLAG]); where
 MINUTES is the time in minutes of the appointment after midnight, and
-STRING is the description of the appointment.")
+STRING is the description of the appointment.
+FLAG, if non-nil, says that the element was made with `appt-add'
+so calling `appt-make-list' again should preserve it.")
 
 (defconst appt-max-time 1439
   "11:59pm in minutes - number of minutes in a day minus 1.")
@@ -493,7 +495,7 @@ The time should be in either 24 hour format or am/pm format."
     (error "Unacceptable time-string"))
   (let* ((appt-time-string (concat new-appt-time " " new-appt-msg))
          (appt-time (list (appt-convert-time new-appt-time)))
-         (time-msg (cons appt-time (list appt-time-string))))
+         (time-msg (list appt-time appt-time-string t)))
     (setq appt-time-msg-list (nconc appt-time-msg-list (list time-msg)))
     (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))))
 
@@ -525,12 +527,15 @@ The time should be in either 24 hour format or am/pm format."
                    (defvar diary-entries-list))
 ;;;###autoload
 (defun appt-make-list ()
-  "Create the appointments list from today's diary buffer.
+  "Update the appointments list from today's diary buffer.
 The time must be at the beginning of a line for it to be
 put in the appointments list (see examples in documentation of
 the function `appt-check').  We assume that the variables DATE and
 NUMBER hold the arguments that `list-diary-entries' received.
-They specify the range of dates that the diary is being processed for."
+They specify the range of dates that the diary is being processed for.
+
+Any appointments made with `appt-add' are not affected by this
+function."
 
   ;; We have something to do if the range of dates that the diary is
   ;; considering includes the current date.
@@ -544,7 +549,11 @@ They specify the range of dates that the diary is being processed for."
                       number)))))
       (save-excursion
         ;; Clear the appointments list, then fill it in from the diary.
-        (setq appt-time-msg-list nil)
+        (dolist (elt appt-time-msg-list)
+          ;; Delete any entries that were not made with appt-add.
+          (unless (nth 2 elt)
+            (setq appt-time-msg-list
+                  (delq elt appt-time-msg-list))))
         (if diary-entries-list
 
             ;; Cycle through the entry-list (diary-entries-list)
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 2f0be116ed1..fe127be3990 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -90,7 +90,7 @@
 
 ;;; Code:
 
-(defconst icalendar-version 0.09
+(defconst icalendar-version 0.10
   "Version number of icalendar.el.")
 
 ;; ======================================================================
@@ -360,12 +360,16 @@ children."
                 (append result (list (list param-name param-value)))))))
     result))
 
-(defun icalendar--decode-isodatetime (isodatetimestring)
+(defun icalendar--decode-isodatetime (isodatetimestring &optional day-shift)
   "Return ISODATETIMESTRING in format like `decode-time'.
-Converts from ISO-8601 to Emacs representation.  If ISODATETIMESTRING
-specifies UTC time (trailing letter Z) the decoded time is given in
-the local time zone! FIXME: TZID-attributes are ignored....! FIXME:
-multiple comma-separated values should be allowed!"
+Converts from ISO-8601 to Emacs representation.  If
+ISODATETIMESTRING specifies UTC time (trailing letter Z) the
+decoded time is given in the local time zone!  If optional
+parameter DAY-SHIFT is non-nil the result is shifted by DAY-SHIFT
+days.
+
+FIXME: TZID-attributes are ignored....!
+FIXME: multiple comma-separated values should be allowed!"
   (icalendar--dmsg isodatetimestring)
   (if isodatetimestring
       ;; day/month/year must be present
@@ -387,6 +391,15 @@ multiple comma-separated values should be allowed!"
                    (char-equal ?Z (aref isodatetimestring 15)))
           ;; if not UTC add current-time-zone offset
           (setq second (+ (car (current-time-zone)) second)))
+        ;; shift if necessary
+        (if day-shift
+            (let ((mdy (calendar-gregorian-from-absolute
+                        (+ (calendar-absolute-from-gregorian
+                            (list month day year))
+                           day-shift))))
+              (setq month (nth 0 mdy))
+              (setq day   (nth 1 mdy))
+              (setq year  (nth 2 mdy))))
         ;; create the decoded date-time
         ;; FIXME!?!
         (condition-case nil
@@ -1083,7 +1096,7 @@ FExport diary data into iCalendar file: ")
 
       ;; we're done, insert everything into the file
       (save-current-buffer
-        (let ((coding-system-for-write 'utf8))
+        (let ((coding-system-for-write 'utf-8))
           (set-buffer (find-file ical-filename))
           (goto-char (point-max))
           (insert "BEGIN:VCALENDAR")
@@ -1284,7 +1297,7 @@ written into the buffer ` *icalendar-errors*'."
                                        (unt
                                         (icalendar--datetime-to-diary-date
                                          (icalendar--decode-isodatetime
-                                          until))))
+                                          until -1))))
                              (setq diary-string
                                    (format
                                     (concat "%%%%(and "
@@ -1297,7 +1310,7 @@ written into the buffer ` *icalendar-errors*'."
                                      dtstart)
                                     (icalendar--datetime-to-diary-date
                                      (icalendar--decode-isodatetime
-                                      until)))))
+                                      until -1)))))
                                (setq diary-string
                                      (format "%%%%(and (diary-cyclic %d %s))"
                                              (* interval 7)
@@ -1369,7 +1382,7 @@ written into the buffer ` *icalendar-errors*'."
                                     e 'DTSTART))))
                              (de (icalendar--datetime-to-diary-date
                                   (icalendar--decode-isodatetime
-                                   until))))
+                                   until -1))))
                          (setq diary-string
                                (format
                                 "%%%%(and (diary-block %s %s))"
@@ -1406,11 +1419,14 @@ written into the buffer ` *icalendar-errors*'."
                                       (format "......"))))
                       (icalendar--split-value rdate)))
              ;; non-recurring event
-             ;; long event
+             ;; all-day event
              ((not (string= start-d end-d))
               (icalendar--dmsg "non-recurring event")
               (let ((ds (icalendar--datetime-to-diary-date dtstart))
-                    (de (icalendar--datetime-to-diary-date dtend)))
+                    (de (icalendar--datetime-to-diary-date
+                         (icalendar--decode-isodatetime
+                          (icalendar--get-event-property e 'DTEND)
+                          -1))))
                 (setq diary-string
                       (format "%%%%(and (diary-block %s %s))"
                               ds de)))
diff --git a/lisp/frame.el b/lisp/frame.el
index e581a586b3e..0fa10babf12 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1344,6 +1344,7 @@ cursor display.  On a text-only terminal, this is not implemented."
                        emacs-quick-startup
                        (eq system-type 'ms-dos)
                        (not (memq initial-window-system '(x w32)))))
+  :group 'cursor
   :global t
   (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
   (if blink-cursor-timer (cancel-timer blink-cursor-timer))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3a9a24b57ce..b994e6520db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2005-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * nnheader.el (nnheader-find-file-noselect): Added doc string.
+
+        * nnfolder.el (nnfolder-read-folder): Use RAWFILE for
+        `nnheader-find-file-noselect' to avoid
+        `large-file-warning-threshold'.
+
+        * gnus-sum.el (gnus-summary-caesar-message): Apply
+        `gnus-treat-article' after rotation.
+
+        * gnus-group.el (gnus-group-clear-data): Mention process/prefix in
+        doc string.
+
+2005-02-22  Arne J,Ax(Brgensen  <arne@arnested.dk>
+
+        * smime.el (smime-sign-buffer): Signal an error if
+        `smime-sign-region' fails.
+        (smime-encrypt-buffer): Signal an error if `smime-encrypt-region'
+        fails.
+
 2005-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-art.el (gnus-parse-news-url, gnus-button-handle-news):
@@ -12,8 +33,8 @@
 
         * mml.el (mime-to-mml): Ditto.
 
-        * rfc2047.el (rfc2047-encode-parameter): Use ietf-drums-tspecials.
-        (rfc2047-quote-decoded-words-containing-tspecials): New variable.
+        * rfc2047.el (rfc2047-quote-decoded-words-containing-tspecials):
+        New variable.
         (rfc2047-decode-region): Quote decoded words containing special
         characters when rfc2047-quote-decoded-words-containing-tspecials
         is non-nil.
@@ -146,7 +167,7 @@
 
         * gnus-start.el (gnus-setup-news): Honor user's setting to
         gnus-message-archive-method.  Suggested by Lute Kamstra
-        <Lute.Kamstra@xs4all.nl>.
+        <lute@gnu.org>.
 
 2004-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0cfc433bd5e..1fe9348f759 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6683,8 +6683,12 @@ specified by `gnus-button-alist'."
       (save-excursion
         (set-buffer gnus-summary-buffer)
         (if server
-            (let ((gnus-refer-article-method (list (list 'nntp server)))
+            (let ((gnus-refer-article-method
+                   (nconc (list (list 'nntp server))
+                          gnus-refer-article-method))
                   (nntp-port-number (or port "nntp")))
+              (gnus-message 7 "Fetching %s with %s"
+                            message-id gnus-refer-article-method)
               (gnus-summary-refer-article message-id))
           (gnus-summary-refer-article message-id))))
      (group
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 5892235deac..767bdacb78e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3028,7 +3028,8 @@ sort in reverse order."
 ;;; Clearing data
 
 (defun gnus-group-clear-data (&optional arg)
-  "Clear all marks and read ranges from the current group."
+  "Clear all marks and read ranges from the current group.
+Obeys the process/prefix convention."
   (interactive "P")
   (gnus-group-iterate arg
     (lambda (group)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b5467aa5921..7748a3529fa 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8859,7 +8859,9 @@ forward."
         (let ((start (window-start))
               buffer-read-only)
           (message-caesar-buffer-body arg)
-          (set-window-start (get-buffer-window (current-buffer)) start))))))
+          (set-window-start (get-buffer-window (current-buffer)) start)))))
+  ;; Create buttons and stuff...
+  (gnus-treat-article nil))
 
 (autoload 'unmorse-region "morse"
   "Convert morse coded text in region to ordinary ASCII text."
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index bf8fc9bac9a..f50530ab459 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -873,7 +873,7 @@ deleted.  Point is left where the deleted region was."
          (buffer (set-buffer
                   (let ((nnheader-file-coding-system
                          nnfolder-file-coding-system))
-                    (nnheader-find-file-noselect file)))))
+                    (nnheader-find-file-noselect file t)))))
     (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
     (if (equal (cadr (assoc group nnfolder-scantime-alist))
                (nth 5 (file-attributes file)))
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 7df5ecae205..6224f9718f1 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -951,6 +951,8 @@ find-file-hooks, etc.
             (nnheader-insert-file-contents file)))))))
 
 (defun nnheader-find-file-noselect (&rest args)
+  "Open a file with some variables bound.
+See `find-file-noselect' for the arguments."
   (let ((format-alist nil)
         (auto-mode-alist (mm-auto-mode-alist))
         (default-major-mode 'fundamental-mode)
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 1d20a3f5c58..cd921719045 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -332,16 +332,17 @@ is expected to contain of a PEM encoded certificate."
 KEYFILE should contain a PEM encoded key and certificate."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-sign-region
-     (point-min) (point-max)
-     (if keyfile
-         keyfile
-       (smime-get-key-with-certs-by-email
-        (completing-read
-         (concat "Sign using which key? "
-                 (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                   ""))
-         smime-keys nil nil (car-safe (car-safe smime-keys))))))))
+    (unless (smime-sign-region
+             (point-min) (point-max)
+             (if keyfile
+                 keyfile
+               (smime-get-key-with-certs-by-email
+                (completing-read
+                 (concat "Sign using which key? "
+                         (if smime-keys (concat "(default " (caar smime-keys) ") ")
+                           ""))
+                 smime-keys nil nil (car-safe (car-safe smime-keys))))))
+      (error "Signing failed"))))
 
 (defun smime-encrypt-buffer (&optional certfiles buffer)
   "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
@@ -350,11 +351,12 @@ a PEM encoded key and certificate.  Uses current buffer if BUFFER is
 nil."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-encrypt-region
-     (point-min) (point-max)
-     (or certfiles
-         (list (read-file-name "Recipient's S/MIME certificate: "
-                               smime-certificate-directory nil))))))
+    (unless (smime-encrypt-region
+             (point-min) (point-max)
+             (or certfiles
+                 (list (read-file-name "Recipient's S/MIME certificate: "
+                                       smime-certificate-directory nil))))
+      (error "Encryption failed"))))
 
 ;; Verify+decrypt region
 
diff --git a/lisp/info.el b/lisp/info.el
index e6f85d19fe1..4905bf0844e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -201,6 +201,15 @@ a tab, a carriage return (control-M), a newline, and `]+'."
   :type 'regexp
   :group 'info)
 
+(defcustom Info-isearch-search t
+  "*If non-nil, isearch invoked in Info mode uses `Info-search' function.
+This allows isearch to search through multiple nodes.
+When isearch fails, it wraps and restarts the search from the
+top/final node depending on search direction."
+  :version "22.1"
+  :type 'boolean
+  :group 'info)
+
 (defcustom Info-mode-hook
   ;; Try to obey obsolete Info-fontify settings.
   (unless (and (boundp 'Info-fontify) (null Info-fontify))
@@ -1637,23 +1646,21 @@ If DIRECTION is `backward', search in the reverse direction."
   (Info-search regexp bound noerror count 'backward))
 
 (defun Info-isearch-search ()
-  (cond
-   (isearch-word
-    (if isearch-forward 'word-search-forward 'word-search-backward))
-   (isearch-regexp
-    (lambda (regexp bound noerror)
-      (condition-case nil
-          (progn
-            (Info-search regexp bound noerror nil
-                         (unless isearch-forward 'backward))
-            (point))
-        (error nil))))
-   (t
-    (if isearch-forward 'search-forward 'search-backward))))
+  (if (and Info-isearch-search (not isearch-word))
+      (lambda (string &optional bound noerror count)
+        (condition-case nil
+            (progn
+              (Info-search (if isearch-regexp string (regexp-quote string))
+                           bound noerror count
+                           (unless isearch-forward 'backward))
+              (point))
+          (error nil)))
+    (let ((isearch-search-fun-function nil))
+      (isearch-search-fun))))
 
 (defun Info-isearch-wrap ()
-  (if isearch-regexp
-      (if isearch-forward (Info-top-node) (Info-final-node))
+  (when (and Info-isearch-search (not isearch-word))
+    (if isearch-forward (Info-top-node) (Info-final-node))
     (goto-char (if isearch-forward (point-min) (point-max)))))
 
 (defun Info-isearch-push-state ()
diff --git a/lisp/international/iso-acc.el b/lisp/international/iso-acc.el
index 971d1d128e6..6c94f4aa562 100644
--- a/lisp/international/iso-acc.el
+++ b/lisp/international/iso-acc.el
@@ -290,6 +290,16 @@ the language you choose)."
       (iso-accents-compose prompt)
     (vector last-input-char)))
 
+
+;; The iso-accents-compose function is called deep inside Emacs' read
+;; key sequence machinery, so the call to read-event below actually
+;; recurses into that machinery.  Doing that does not cause any
+;; problem on its own, but read-event will have marked the window's
+;; display matrix to be accurate -- which is broken by the subsequent
+;; call to delete-region.  Therefore, we must call force-window-update
+;; after delete-region to explicitly clear the accurate state of the
+;; window's display matrix.
+
 (defun iso-accents-compose (prompt)
   (let* ((first-char last-input-char)
          (list (assq first-char iso-accents-list))
@@ -308,7 +318,9 @@ the language you choose)."
                             (read-event))
                         (insert first-char)
                         (prog1 (read-event)
-                          (delete-region (1- (point)) (point)))))
+                          (delete-region (1- (point)) (point))
+                          ;; Display is no longer up-to-date.
+                          (force-window-update (selected-window)))))
          (entry (cdr (assq second-char list))))
     (if entry
         ;; Found it: return the mapped char
diff --git a/lisp/subr.el b/lisp/subr.el
index b22e7886f2f..b318f224918 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1981,13 +1981,16 @@ If there is no plausible default, return nil."
             (re-search-forward "\\(\\sw\\|\\s_\\)+"
                                (save-excursion (end-of-line) (point))
                                t))
-        (progn (goto-char (match-end 0))
-               (buffer-substring-no-properties
-                (point)
-                (progn (forward-sexp -1)
-                       (while (looking-at "\\s'")
-                         (forward-char 1))
-                       (point))))
+        (progn
+          (goto-char (match-end 0))
+          (condition-case nil
+              (buffer-substring-no-properties
+               (point)
+               (progn (forward-sexp -1)
+                      (while (looking-at "\\s'")
+                        (forward-char 1))
+                      (point)))
+            (error nil)))
       nil)))
 
 (defmacro with-syntax-table (table &rest body)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 4b878f4f240..d15b72c98ba 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,7 +1,7 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tex
@@ -602,7 +602,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
            ;; degenerate to nasty complexity (because we try to match the
            ;; closing brace, which forces trying all matching combinations).
            (arg "{\\(?:[^{}\\]\\|\\\\.\\|{[^}]*}\\)*"))
-       `((,(concat "[_^] *\\([^\n\\{}]\\|" slash general "\\|" arg "}\\)")
+       `((,(concat "[_^] *\\([^\n\\{}#]\\|" slash general "\\|#[0-9]\\|" arg "}\\)")
           (1 (tex-font-lock-suscript (match-beginning 0))
              append))))))
   "Experimental expressions to highlight in TeX modes.")
@@ -1027,10 +1027,8 @@ Entering SliTeX mode runs the hook `text-mode-hook', then the hook
        'tex-categorize-whitespace)
   (set (make-local-variable 'facemenu-add-face-function)
        (lambda (face end)
-         (let ((face-text (cdr (assq face tex-face-alist))))
-           (if face-text
-               face-text
-             (error "Face %s not configured for %s mode" face mode-name)))))
+         (or (cdr (assq face tex-face-alist))
+             (error "Face %s not configured for %s mode" face mode-name))))
   (set (make-local-variable 'facemenu-end-add-face) "}")
   (set (make-local-variable 'facemenu-remove-face-function) t)
   (set (make-local-variable 'font-lock-defaults)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 4d990a61f88..e7f05587e71 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,5 +1,13 @@
+2005-02-24  Lute Kamstra  <lute@gnu.org>
+
+        * modes.texi (Defining Minor Modes): Explain that INIT-VALUE,
+        LIGHTER, and KEYMAP can be omitted when KEYWORD-ARGS are used.
+
 2005-02-23  Lute Kamstra  <lute@gnu.org>
 
+        * modes.texi (Defining Minor Modes): define-minor-mode can be used
+        to define global minor modes as well.
+
         * display.texi (Managing Overlays): overlay-buffer returns nil for
         deleted overlays.
 
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 62f152e1d41..530044ac037 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -1100,7 +1100,7 @@ characters are reserved for major modes.)
   The macro @code{define-minor-mode} offers a convenient way of
 implementing a mode in one self-contained definition.
 
-@defmac define-minor-mode mode doc [init-value [lighter [keymap keyword-args... body...]]]
+@defmac define-minor-mode mode doc [init-value [lighter [keymap]]] keyword-args... body...
 @tindex define-minor-mode
 This macro defines a new minor mode whose name is @var{mode} (a
 symbol).  It defines a command named @var{mode} to toggle the minor
@@ -1121,8 +1121,10 @@ specifying bindings in this form:
 (@var{key-sequence} . @var{definition})
 @end example
 
-The @var{keyword-args} consist of keywords followed by corresponding
-values.  A few keywords have special meanings:
+The above three arguments @var{init-value}, @var{lighter}, and
+@var{keymap} can be (partially) omitted when @var{keyword-args} are
+used.  The @var{keyword-args} consist of keywords followed by
+corresponding values.  A few keywords have special meanings:
 
 @table @code
 @item :global @var{global}
diff --git a/man/ChangeLog b/man/ChangeLog
index beb8925ec45..667bcea4606 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23  Lute Kamstra  <lute@gnu.org>
+
+        * cmdargs.texi (Initial Options): Add cross reference.
+
 2005-02-18  Jonathan Yavner  <jyavner@member.fsf.org>
 
         * ses.texi: Add concept/function/variable indices (this work was
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index a8d13da3563..a8b34e4095d 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1,5 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985,86,87,93,94,95,97,2001,03,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97,
+@c   2001, 03, 04, 2005 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Emacs Invocation, X Resources, GNU Free Documentation License, Top
 @appendix Command Line Arguments for Emacs Invocation
@@ -293,6 +294,8 @@ your own.
 @opindex --debug-init
 @cindex errors in init file
 Enable the Emacs Lisp debugger for errors in the init file.
+@xref{Error Debugging,, Entering the Debugger on an Error, elisp, The
+GNU Emacs Lisp Reference Manual}.
 
 @item --unibyte
 @opindex --unibyte