Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

14 files changed, 234 insertions, 143 deletions

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 8660f75fa95..83af2156831 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -256,11 +256,9 @@
 (defvar css-font-lock-defaults
   '(css-font-lock-keywords nil t))
 
-(unless (fboundp 'prog-mode) (defalias 'prog-mode 'fundamental-mode))
-
 ;;;###autoload (add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
 ;;;###autoload
-(define-derived-mode css-mode prog-mode "CSS"
+(define-derived-mode css-mode fundamental-mode "CSS"
   "Major mode to edit Cascading Style Sheets."
   (set (make-local-variable 'font-lock-defaults) css-font-lock-defaults)
   (set (make-local-variable 'comment-start) "/*")
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 27c425de448..0516a4ab8a5 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -836,6 +836,10 @@ in the active region."
                    (fill-region-as-paragraph beg end justify))))))
      fill-pfx)))
 
+(declare-function comment-search-forward "newcomment" (limit &optional noerror))
+(declare-function comment-string-strip "newcomment" (str beforep afterp))
+
+
 (defun fill-comment-paragraph (&optional justify)
   "Fill current comment.
 If we're not in a comment, just return nil so that the caller
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 73e8ec49045..16265ae42d1 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1531,29 +1531,42 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
     (if flyspell-issue-message-flag (message "Checking region..."))
     (set-buffer curbuf)
     (ispell-check-version)
-    (let ((c (apply 'ispell-call-process-region beg
-                    end
-                    ispell-program-name
-                    nil
-                    buffer
-                    nil
-                    (if ispell-really-aspell "list" "-l")
-                    (let (args)
-                      ;; Local dictionary becomes the global dictionary in use.
-                      (if ispell-local-dictionary
-                          (setq ispell-dictionary ispell-local-dictionary))
-                      (setq args (ispell-get-ispell-args))
-                      (if ispell-dictionary ; use specified dictionary
-                          (setq args
-                                (append (list "-d" ispell-dictionary) args)))
-                      (if ispell-personal-dictionary ; use specified pers dict
-                          (setq args
-                                (append args
-                                        (list "-p"
-                                              (expand-file-name
-                                               ispell-personal-dictionary)))))
-                      (setq args (append args ispell-extra-args))
-                      args))))
+    ;; Local dictionary becomes the global dictionary in use.
+    (setq ispell-current-dictionary
+          (or ispell-local-dictionary ispell-dictionary))
+    (setq ispell-current-personal-dictionary
+          (or ispell-local-pdict ispell-personal-dictionary))
+    (let ((args (ispell-get-ispell-args))
+          (encoding (ispell-get-coding-system))
+          c)
+      (if (and ispell-current-dictionary  ; use specified dictionary
+               (not (member "-d" args)))  ; only define if not overridden
+          (setq args
+                (append (list "-d" ispell-current-dictionary) args)))
+      (if ispell-current-personal-dictionary ; use specified pers dict
+          (setq args
+                (append args
+                        (list "-p"
+                              (expand-file-name
+                               ispell-current-personal-dictionary)))))
+      (setq args (append args ispell-extra-args))
+      (if (and ispell-really-aspell
+               ispell-aspell-supports-utf8)
+          (setq args
+                (append args
+                        (list
+                         (concat "--encoding="
+                                 (symbol-name
+                                  encoding))))))
+      (let ((process-coding-system-alist (list (cons "\\.*" encoding))))
+        (setq c (apply 'ispell-call-process-region beg
+                       end
+                       ispell-program-name
+                       nil
+                       buffer
+                       nil
+                       (if ispell-really-aspell "list" "-l")
+                       args)))
       (if (eq c 0)
           (progn
             (flyspell-process-localwords buffer)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 926e0debda1..163f436e53d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -981,7 +981,7 @@ Assumes that value contains no whitespace."
                 "[^[:alpha:]]"
                 (regexp-opt otherchars)
                 t                            ; We can't tell, so set this to t
-                (list "-d" dict-name "--encoding=utf-8")
+                (list "-d" dict-name)
                 nil                             ; aspell doesn't support this
                 ;; Here we specify the encoding to use while communicating with
                 ;; aspell.  This doesn't apply to command line arguments, so
@@ -1161,12 +1161,13 @@ The variable `ispell-library-directory' defines the library location."
               (delete-menu-item '("Edit" "Spell")) ; in case already defined
               (add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
 
-;;; Allow incrementing characters as integers in XEmacs 20
-(if (and (featurep 'xemacs)
-         (fboundp 'int-char))
-    (fset 'ispell-int-char 'int-char)
-  ;; Emacs and XEmacs 19 or earlier
-  (fset 'ispell-int-char 'identity))
+(defalias 'ispell-int-char
+  ;; Allow incrementing characters as integers in XEmacs 20
+  (if (and (featurep 'xemacs)
+           (fboundp 'int-char))
+      'int-char
+    ;; Emacs and XEmacs 19 or earlier
+    'identity))
 
 
 ;;; **********************************************************************
@@ -2480,6 +2481,13 @@ Keeps argument list for future ispell invocations for no async support."
               (append args
                       (list "-p"
                             (expand-file-name ispell-current-personal-dictionary)))))
+    (if (and ispell-really-aspell
+             ispell-aspell-supports-utf8)
+        (setq args
+              (append args
+                      (list
+                       (concat "--encoding="
+                               (symbol-name (ispell-get-coding-system)))))))
     (setq args (append args ispell-extra-args))
 
     ;; Initially we don't know any buffer's local words.
@@ -3503,9 +3511,9 @@ You can bind this to the key C-c i in GNUS or mail by adding to
            (cite-regexp                 ;Prefix of quoted text
             (cond
              ((functionp 'sc-cite-regexp)       ; sc 3.0
-              (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
-                      (with-no-warnings
-                       (ispell-non-empty-string sc-reference-tag-string))))
+              (with-no-warnings
+                (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
+                        (ispell-non-empty-string sc-reference-tag-string))))
              ((boundp 'sc-cite-regexp)          ; sc 2.3
               (concat "\\(" sc-cite-regexp "\\)" "\\|"
                       (with-no-warnings
diff --git a/lisp/textmodes/org-export-latex.el b/lisp/textmodes/org-export-latex.el
index b1b31b622d1..eef1c10e5b6 100644
--- a/lisp/textmodes/org-export-latex.el
+++ b/lisp/textmodes/org-export-latex.el
@@ -1077,9 +1077,8 @@ Valid parameters are
              (path (insert (format "\\href{%s}{%s}" path desc)))
              (t (insert "\\texttt{" desc "}")))))))
 
-(defun org-export-latex-cleaned-string 
+(defun org-export-latex-cleaned-string (&optional commentsp)
   ;; FIXME remove commentsp call in org.el and here
-  (&optional commentsp)
   "Clean stuff in the LaTeX export."
 
   ;; Preserve line breaks
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index b555e6c1102..0535f679c40 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -3883,6 +3883,84 @@ If it is less than 8, the level-1 face gets re-used for level N+1 etc."
   :type 'number
   :group 'org-faces)
 
+;;; Function declarations.
+(declare-function add-to-diary-list "diary-lib"
+                  (date string specifier &optional marker globcolor literal))
+(declare-function table--at-cell-p "table" (position &optional object at-column))
+(declare-function Info-find-node "info" (filename nodename &optional no-going-back))
+(declare-function Info-goto-node "info" (nodename &optional fork))
+(declare-function bbdb "ext:bbdb-com" (string elidep))
+(declare-function bbdb-company "ext:bbdb-com" (string elidep))
+(declare-function bbdb-current-record "ext:bbdb-com" (&optional planning-on-modifying))
+(declare-function bbdb-name "ext:bbdb-com" (string elidep))
+(declare-function bbdb-record-getprop "ext:bbdb" (record property))
+(declare-function bbdb-record-name "ext:bbdb" (record))
+(declare-function bibtex-beginning-of-entry "bibtex" ())
+(declare-function bibtex-generate-autokey "bibtex" ())
+(declare-function bibtex-parse-entry "bibtex" (&optional content))
+(declare-function bibtex-url "bibtex" (&optional pos no-browse))
+(declare-function calendar-astro-date-string    "cal-julian" (&optional date))
+(declare-function calendar-bahai-date-string    "cal-bahai"  (&optional date))
+(declare-function calendar-check-holidays       "holidays"   (date))
+(declare-function calendar-chinese-date-string  "cal-china"  (&optional date))
+(declare-function calendar-coptic-date-string   "cal-coptic" (&optional date))
+(declare-function calendar-ethiopic-date-string "cal-coptic" (&optional date))
+(declare-function calendar-forward-day          "cal-move"   (arg))
+(declare-function calendar-french-date-string   "cal-french" (&optional date))
+(declare-function calendar-goto-date            "cal-move"   (date))
+(declare-function calendar-goto-today           "cal-move"   ())
+(declare-function calendar-hebrew-date-string   "cal-hebrew" (&optional date))
+(declare-function calendar-islamic-date-string  "cal-islam"  (&optional date))
+(declare-function calendar-iso-date-string      "cal-iso"    (&optional date))
+(declare-function calendar-julian-date-string   "cal-julian" (&optional date))
+(declare-function calendar-mayan-date-string    "cal-mayan"  (&optional date))
+(declare-function calendar-persian-date-string  "cal-persia" (&optional date))
+(declare-function cdlatex-tab "ext:cdlatex" ())
+(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
+(declare-function gnus-article-show-summary "gnus-art" ())
+(declare-function gnus-summary-last-subject "gnus-sum" ())
+(declare-function mh-display-msg "mh-show" (msg-num folder-name))
+(declare-function mh-find-path "mh-utils" ())
+(declare-function mh-get-header-field "mh-utils" (field))
+(declare-function mh-get-msg-num "mh-utils" (error-if-no-message))
+(declare-function mh-header-display "mh-show" ())
+(declare-function mh-index-previous-folder "mh-search" ())
+(declare-function mh-normalize-folder-name "mh-utils" (folder &optional empty-string-okay dont-remove-trailing-slash return-nil-if-folder-empty))
+(declare-function mh-search "mh-search" (folder search-regexp &optional redo-search-flag window-config))
+(declare-function mh-search-choose "mh-search" (&optional searcher))
+(declare-function mh-show "mh-show" (&optional message redisplay-flag))
+(declare-function mh-show-buffer-message-number "mh-comp" (&optional buffer))
+(declare-function mh-show-header-display "mh-show" t t)
+(declare-function mh-show-msg "mh-show" (msg))
+(declare-function mh-show-show "mh-show" t t)
+(declare-function mh-visit-folder "mh-folder" (folder &optional range index-data))
+(declare-function org-export-latex-cleaned-string "org-export-latex" (&optional commentsp))
+(declare-function parse-time-string "parse-time" (string))
+(declare-function remember "remember" (&optional initial))
+(declare-function remember-buffer-desc "remember" ())
+(declare-function rmail-narrow-to-non-pruned-header "rmail" ())
+(declare-function rmail-show-message "rmail" (&optional n no-summary))
+(declare-function rmail-what-message "rmail" ())
+(declare-function elmo-folder-exists-p "ext:elmo" (folder) t)
+(declare-function elmo-message-entity-field "ext:elmo-msgdb" (entity field &optional type))
+(declare-function elmo-message-field "ext:elmo" (folder number field &optional type) t)
+(declare-function vm-beginning-of-message "ext:vm-page" ())
+(declare-function vm-follow-summary-cursor "ext:vm-motion" ())
+(declare-function vm-get-header-contents "ext:vm-summary" (message header-name-regexp &optional clump-sep))
+(declare-function vm-isearch-narrow "ext:vm-search" ())
+(declare-function vm-isearch-update "ext:vm-search" ())
+(declare-function vm-select-folder-buffer "ext:vm-macro" ())
+(declare-function vm-su-message-id "ext:vm-summary" (m))
+(declare-function vm-su-subject "ext:vm-summary" (m))
+(declare-function vm-summarize "ext:vm-summary" (&optional display raise))
+(declare-function wl-folder-get-elmo-folder "ext:wl-folder" (entity &optional no-cache))
+(declare-function wl-summary-goto-folder-subr "ext:wl-summary" (&optional name scan-type other-window sticky interactive scoring force-exit))
+(declare-function wl-summary-jump-to-msg-by-message-id "ext:wl-summary" (&optional id))
+(declare-function wl-summary-line-from "ext:wl-summary" ())
+(declare-function wl-summary-line-subject "ext:wl-summary" ())
+(declare-function wl-summary-message-number "ext:wl-summary" ())
+(declare-function wl-summary-redisplay "ext:wl-summary" (&optional arg))
+
 ;;; Variables for pre-computed regular expressions, all buffer local
 
 (defvar org-drawer-regexp nil
@@ -16838,7 +16916,7 @@ D may be an absolute day number, or a calendar-type list (month day year)."
 
 (defun org-calendar-holiday ()
   "List of holidays, for Diary display in Org-mode."
-  (let ((hl (check-calendar-holidays date)))
+  (let ((hl (calendar-check-holidays date)))
     (if hl (mapconcat 'identity hl "; "))))
 
 (defun org-diary-sexp-entry (sexp entry date)
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 201eeebb623..06ebeea9fa0 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -440,8 +440,8 @@ negative arg -N means kill forward to Nth end of paragraph."
               (end-of-paragraph-text))))))
 
 (defun forward-sentence (&optional arg)
-  "Move forward to next `sentence-end'.  With argument, repeat.
-With negative argument, move backward repeatedly to `sentence-beginning'.
+  "Move forward to next end of sentence.  With argument, repeat.
+With negative argument, move backward repeatedly to start of sentence.
 
 The variable `sentence-end' is a regular expression that matches ends of
 sentences.  Also, every paragraph boundary terminates sentences as well."
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index e49c408b6e5..e7d292f48bb 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -33,6 +33,18 @@
 (require 'reftex)
 ;;;
 
+(declare-function TeX-argument-insert "ext:tex" (name optional &optional prefix))
+(declare-function TeX-argument-prompt "ext:tex" (optional prompt default &optional complete))
+(declare-function multi-prompt "ext:multi-prompt" 
+                  (separator
+                   unique prompt table
+                   &optional mp-predicate require-match initial history))
+(declare-function LaTeX-add-index-entries "ext:tex" (&rest entries) t)
+(declare-function LaTeX-add-labels "ext:tex" (&rest entries) t)
+(declare-function LaTeX-bibitem-list "ext:tex" () t)
+(declare-function LaTeX-index-entry-list "ext:tex" () t)
+(declare-function LaTeX-label-list "ext:tex" () t)
+
 (defun reftex-plug-flag (which)
   ;; Tell if a certain flag is set in reftex-plug-into-AUCTeX
   (or (eq t reftex-plug-into-AUCTeX)
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index cfee8b53c0b..86ad54a73fa 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -352,13 +352,15 @@ will display info in the echo area."
     (message "Automatic display of crossref information was turned on")))
 
 (defun reftex-start-itimer-once ()
-   (and reftex-mode
+   (and (featurep 'xemacs) reftex-mode
         (not (itimer-live-p reftex-auto-view-crossref-timer))
         (setq reftex-auto-view-crossref-timer
               (start-itimer "RefTeX Idle Timer"
                             'reftex-view-crossref-when-idle 
                             reftex-idle-time nil t))))
 
+(declare-function bibtex-beginning-of-entry "bibtex" ())
+
 (defun reftex-view-crossref-from-bibtex (&optional arg)
   "View location in a LaTeX document which cites the BibTeX entry at point.
 Since BibTeX files can be used by many LaTeX documents, this function
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index f430e9bd01a..73bcf6d6a74 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -39,6 +39,9 @@
 (defvar transient-mark-mode)
 (defvar TeX-master)
 ;; END remove for XEmacs release
+
+(declare-function texmathp "ext:texmathp" ())
+
 (defun reftex-index-selection-or-word (&optional arg phrase)
   "Put selection or the word near point into the default index macro.
 This uses the information in `reftex-index-default-macro' to make an index
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index ae147cc6b97..d1d979b3fc0 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -995,8 +995,10 @@ always show the current section in connection with the option
       (select-frame current-toc-frame)
       (switch-to-buffer "*toc*")
       (select-frame current-frame)
-      (if (fboundp 'focus-frame) (focus-frame current-frame)
-        (if (fboundp 'x-focus-frame) (x-focus-frame current-frame)))
+      (if (fboundp 'x-focus-frame) (x-focus-frame current-frame)
+        ;; focus-frame has done nothing in Emacs since at least v21.
+        (if (featurep 'xemacs)
+            (if (fboundp 'focus-frame) (focus-frame current-frame))))
       (select-window current-window)
       (when (eq reftex-auto-recenter-toc 'frame)
         (unless reftex-toc-auto-recenter-timer
diff --git a/lisp/textmodes/remember-diary.el b/lisp/textmodes/remember-diary.el
deleted file mode 100644
index e35909fb589..00000000000
--- a/lisp/textmodes/remember-diary.el
+++ /dev/null
@@ -1,94 +0,0 @@
-;;; remember-diary --- extracting diary information from buffers
-
-;; Copyright (C) 1999, 2000, 2001, 2004, 2007 Free Software Foundation, Inc.
-
-;; Author: Sacha Chua <sacha@free.net.ph>
-;; Created: 24 Mar 2004
-;; Keywords: data memory todo pim diary
-;; URL: http://gna.org/projects/remember-el/
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This module recognizes entries of the form
-;;
-;;     DIARY: ....
-;;
-;; and puts them in your ~/.diary (or remember-diary-file) together
-;; with an annotation. Planner-style dates (yyyy.mm.dd) are converted
-;; to yyyy-mm-dd so that diary can understand them.
-;;
-;; For example:
-;;
-;; DIARY: 2003.08.12 Sacha's birthday
-;;
-;; is stored as
-;;
-;; 2003.08.12 Sacha's birthday [[/home/sacha/notebook/emacs/emacs-wiki/remember-diary.el]]
-;;
-;; To use, add the following to your .emacs:
-;;
-;;    (require 'remember-diary)
-;;    ;; This should be before other entries that may return t
-;;    (add-to-list 'remember-handler-functions 'remember-diary-extract-entries)
-;;
-
-(require 'remember)
-(require 'diary-lib)
-
-;;; Code:
-(defcustom remember-diary-file diary-file
-  "*File for extracted diary entries."
-  :type 'file
-  :group 'remember)
-
-(defun remember-diary-convert-entry (entry)
-  "Translate MSG to an entry readable by diary."
-  (save-match-data
-    (when remember-annotation
-        (setq entry (concat entry " " remember-annotation)))
-    (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" entry)
-        (replace-match
-         (if european-calendar-style
-             (concat (match-string 3 entry) "/"
-                     (match-string 2 entry) "/"
-                     (match-string 1 entry))
-           (concat (match-string 2 entry) "/"
-                   (match-string 3 entry) "/"
-                   (match-string 1 entry)))
-         t t entry)
-      entry)))
-
-;;;###autoload
-(defun remember-diary-extract-entries ()
-  "Extract diary entries from the region."
-  (save-excursion
-    (goto-char (point-min))
-    (let (list)
-      (while (re-search-forward "^DIARY:\\s-*\\(.+\\)" nil t)
-        (add-to-list 'list (remember-diary-convert-entry (match-string 1))))
-      (when list
-        (make-diary-entry (mapconcat 'identity list "\n")
-                          nil remember-diary-file))
-      nil))) ;; Continue processing
-
-(provide 'remember-diary)
-
-;; arch-tag: bda8a3f8-9a9b-46aa-8493-d71d7f1e445d
-;;; remember-diary.el ends here
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 7249f1d4c57..81be7ace146 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -153,6 +153,29 @@
 ;; Faridu'd-Din `Attar wrote: "Be occupied as little as possible with
 ;; things of the outer world but much with things of the inner world;
 ;; then right action will overcome inaction."
+;;
+;; * Diary integration
+;;
+;; To use, add the following to your .emacs:
+;;
+;;   ;; This should be before other entries that may return t
+;;   (add-to-list 'remember-handler-functions 'remember-diary-extract-entries)
+;;
+;; This module recognizes entries of the form
+;;
+;;   DIARY: ....
+;;
+;; and puts them in your ~/.diary (or remember-diary-file) together
+;; with an annotation.  Dates in the form YYYY.MM.DD are converted to
+;; YYYY-MM-DD so that diary can understand them.
+;;
+;; For example:
+;;
+;;   DIARY: 2003.08.12 Sacha's birthday
+;;
+;; is stored as
+;;
+;;   2003.08.12 Sacha's birthday
 
 ;;; History:
 
@@ -440,6 +463,46 @@ application."
     (kill-buffer (current-buffer))
     (jump-to-register remember-register)))
 
+;;; Diary integration
+
+(defcustom remember-diary-file nil
+  "*File for extracted diary entries.
+If this is nil, then `diary-file' will be used instead."
+  :type 'file
+  :group 'remember)
+
+(defun remember-diary-convert-entry (entry)
+  "Translate MSG to an entry readable by diary."
+  (save-match-data
+    (when remember-annotation
+        (setq entry (concat entry " " remember-annotation)))
+    (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" entry)
+        (replace-match
+         (if european-calendar-style
+             (concat (match-string 3 entry) "/"
+                     (match-string 2 entry) "/"
+                     (match-string 1 entry))
+           (concat (match-string 2 entry) "/"
+                   (match-string 3 entry) "/"
+                   (match-string 1 entry)))
+         t t entry)
+      entry)))
+
+(autoload 'make-diary-entry "diary-lib")
+
+;;;###autoload
+(defun remember-diary-extract-entries ()
+  "Extract diary entries from the region."
+  (save-excursion
+    (goto-char (point-min))
+    (let (list)
+      (while (re-search-forward "^DIARY:\\s-*\\(.+\\)" nil t)
+        (add-to-list 'list (remember-diary-convert-entry (match-string 1))))
+      (when list
+        (make-diary-entry (mapconcat 'identity list "\n")
+                          nil (or remember-diary-file diary-file)))
+      nil))) ;; Continue processing
+
 ;;; Internal Functions:
 
 (defvar remember-mode-map
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 73b6ec3920e..55e7134f87e 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3001,14 +3001,17 @@ Default is to leave paragraph indentation as is."
 (put 'printindex 'texinfo-format 'texinfo-format-printindex)
 
 (defun texinfo-format-printindex ()
-  (let ((indexelts (symbol-value
-                    (cdr (assoc (texinfo-parse-arg-discard)
-                                texinfo-indexvar-alist))))
-        opoint)
+  (let* ((arg (texinfo-parse-arg-discard))
+         (fmt (cdr (assoc arg texinfo-short-index-format-cmds-alist)))
+         (index-list (delq nil (mapcar (lambda (e)
+                                         (and (eq fmt (get (cdr e) 'texinfo-format))
+                                              (cdr (assoc (car e) texinfo-indexvar-alist))))
+                                       texinfo-short-index-cmds-alist)))
+         (indexelts (apply #'append nil (mapcar #'symbol-value index-list)))
+         opoint)
     (insert "\n* Menu:\n\n")
     (setq opoint (point))
     (texinfo-print-index nil indexelts)
-
     (if (memq system-type '(vax-vms windows-nt ms-dos))
         (texinfo-sort-region opoint (point))
       (shell-command-on-region opoint (point) "sort -fd" 1))))