Merged in changes from CVS HEAD

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-12
   Add section on button package to lisp reference manual

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-13
   Minor tweaks to Buttons section in lispref/display.texi

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


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

4 files changed, 40 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97539c809ed..ed4f3a8433e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2003-12-31  John Paul Wallington  <jpw@gnu.org>
+
+        * bindings.el (completion-ignored-extensions): Add .pfsl.
+
+2003-12-31  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-nonreadable-directory-p): New defun to check for
+        nonreadable directory without activating tramp (to avoid problems
+        with checking incomplete tramp paths.
+        (ido-set-current-directory, ido-file-internal)
+        (ido-file-name-all-completions1): Use it.
+
+2003-12-30  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help-mode.el (help-xref-info-regexp): Make hyperlinks to Info
+        documentation if the anchor (or node) name is preceded by `info
+        anchor' or `Info anchor' in addition to earlier `info node' and
+        `Info node'.
+        (help-make-xrefs): Adapt to new value of `help-xref-info-regexp'.
+
 2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
 
         * mail/rmail.el (rmail-convert-to-babyl-format): Fix off-by-one
diff --git a/lisp/bindings.el b/lisp/bindings.el
index ab5bb30699e..ed4da745b2d 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -258,14 +258,14 @@ buffer size, the line number and the column number.")
 (defvar mode-line-modes nil
   "Mode-line control for displaying major and minor modes.")
 
-(defvar mode-line-major-mode-keymap 
+(defvar mode-line-major-mode-keymap
   (let ((map (make-sparse-keymap)))
     (define-key map [mode-line mouse-2] 'describe-mode)
     (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
     map) "\
 Keymap to display on major mode.")
 
-(defvar mode-line-minor-mode-keymap 
+(defvar mode-line-minor-mode-keymap
   (let ((map (make-sparse-keymap)))
     (define-key map [mode-line mouse-2] 'mode-line-minor-mode-help)
     (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
@@ -314,7 +314,7 @@ Keymap to display on minor modes.")
 
   (setq-default mode-line-position
     `((-3 ,(propertize "%p" 'help-echo help-echo))
-      (size-indication-mode 
+      (size-indication-mode
        (8 ,(propertize " of %I" 'help-echo help-echo)))
       (line-number-mode
        ((column-number-mode
@@ -511,8 +511,8 @@ is okay.  See `mode-line-format'.")
          ".fas" ".lib" ".mem"
          ;; CMUCL
          ".x86f" ".sparcf"
-         ;; Other CL implementations (Allegro, LispWorks)
-         ".fasl" ".ufsl" ".fsl" ".dxl"
+         ;; Other CL implementations (Allegro, LispWorks, OpenMCL)
+         ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl"
          ;; Libtool
          ".lo" ".la"
          ;; Gettext
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 087e4f159df..032509b9614 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -231,7 +231,7 @@ when help commands related to multilingual environment (e.g.,
 
 
 (defconst help-xref-info-regexp
-  (purecopy "\\<[Ii]nfo[ \t\n]+node[ \t\n]+`\\([^']+\\)'")
+  (purecopy "\\<[Ii]nfo[ \t\n]+\\(node\\|anchor\\)[ \t\n]+`\\([^']+\\)'")
   "Regexp matching doc string references to an Info node.")
 
 ;;;###autoload
@@ -310,11 +310,11 @@ that."
               ;; Info references
               (save-excursion
                 (while (re-search-forward help-xref-info-regexp nil t)
-                  (let ((data (match-string 1)))
+                  (let ((data (match-string 2)))
                     (save-match-data
                       (unless (string-match "^([^)]+)" data)
                         (setq data (concat "(emacs)" data))))
-                    (help-xref-button 1 'help-info data))))
+                    (help-xref-button 2 'help-info data))))
               ;; Mule related keywords.  Do this before trying
               ;; `help-xref-symbol-regexp' because some of Mule
               ;; keywords have variable or function definitions.
diff --git a/lisp/ido.el b/lisp/ido.el
index 165142ea222..4593c55dff7 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1397,6 +1397,15 @@ This function also adds a hook to the minibuffer."
         (substring s 0 l)
       s)))
 
+(defun ido-nonreadable-directory-p (dir)
+  ;; Return t if dir is a directory, but not readable
+  ;; Do not check for non-readable directories via tramp, as this causes a premature
+  ;; connect on incomplete tramp paths (after entring just method:).
+  (let ((ido-enable-tramp-completion nil))
+    (and (ido-final-slash dir)
+         (file-directory-p dir)
+         (not (file-readable-p dir)))))
+
 (defun ido-set-current-directory (dir &optional subdir no-merge)
   ;; Set ido's current directory to DIR or DIR/SUBDIR
   (setq dir (ido-final-slash dir t))
@@ -1410,7 +1419,7 @@ This function also adds a hook to the minibuffer."
     (setq ido-current-directory dir)
     (if (get-buffer ido-completion-buffer)
         (kill-buffer ido-completion-buffer))
-    (setq ido-directory-nonreadable (not (file-readable-p dir)))
+    (setq ido-directory-nonreadable (ido-nonreadable-directory-p dir))
     t))
 
 (defun ido-set-current-home (&optional dir)
@@ -1867,7 +1876,7 @@ If INITIAL is non-nil, it specifies the initial input string."
   (unless item
     (setq item 'file))
   (let* ((ido-current-directory (ido-expand-directory default))
-         (ido-directory-nonreadable (not (file-readable-p ido-current-directory)))
+         (ido-directory-nonreadable (ido-nonreadable-directory-p ido-current-directory))
          filename)
 
     (cond
@@ -2706,7 +2715,7 @@ for first matching file."
 
 (defun ido-file-name-all-completions1 (dir)
   (cond
-   ((not (file-readable-p dir)) '())
+   ((ido-nonreadable-directory-p dir) '())
    ((and ido-enable-tramp-completion
          (string-match "\\`/\\([^/:]+:\\([^/:@]+@\\)?\\)\\'" dir))