summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-01-16 15:50:23 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-01-16 15:50:23 -0500
commitabd5cfe880473c8da925d5b83e52c8019803d87d (patch)
treef1bca818e484f04bba5752b25fc9131fbd375d9e
parent4572d05251f0b1eeca32a11b6315188623ad8341 (diff)
downloademacs-abd5cfe880473c8da925d5b83e52c8019803d87d.tar.gz
* pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/pcmpl-unix.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c30e5a3a1c..5ff2d7b24c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-16 Jari Aalto <jari.aalto@cante.net>
+
+ * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix.
+
2010-01-16 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267).
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 546d4a2591d..9282fe87b5a 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -85,7 +85,10 @@ with the SSH option \"HashKnownHosts no\"."
(while (pcomplete-here (funcall pcomplete-command-completion-function))))
(defun pcmpl-unix-read-passwd-file (file)
- "Return an alist correlating gids to group names in FILE."
+ "Return an alist correlating gids to group names in FILE.
+
+If FILE is in hashed format (as described in the OpenSSH
+documentation), this function returns nil."
(let (names)
(when (file-readable-p file)
(with-temp-buffer