aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-01-16 15:50:23 -0500
committerChong Yidong2010-01-16 15:50:23 -0500
commitabd5cfe880473c8da925d5b83e52c8019803d87d (patch)
treef1bca818e484f04bba5752b25fc9131fbd375d9e
parent4572d05251f0b1eeca32a11b6315188623ad8341 (diff)
downloademacs-abd5cfe880473c8da925d5b83e52c8019803d87d.tar.gz
emacs-abd5cfe880473c8da925d5b83e52c8019803d87d.zip
* 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 @@
12010-01-16 Jari Aalto <jari.aalto@cante.net>
2
3 * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix.
4
12010-01-16 Chong Yidong <cyd@stupidchicken.com> 52010-01-16 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). 7 * 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\"."
85 (while (pcomplete-here (funcall pcomplete-command-completion-function)))) 85 (while (pcomplete-here (funcall pcomplete-command-completion-function))))
86 86
87(defun pcmpl-unix-read-passwd-file (file) 87(defun pcmpl-unix-read-passwd-file (file)
88 "Return an alist correlating gids to group names in FILE." 88 "Return an alist correlating gids to group names in FILE.
89
90If FILE is in hashed format (as described in the OpenSSH
91documentation), this function returns nil."
89 (let (names) 92 (let (names)
90 (when (file-readable-p file) 93 (when (file-readable-p file)
91 (with-temp-buffer 94 (with-temp-buffer