(x-display-name, x-setup-function-keys): Unify doc-strings with X versions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33819ec6466eb9398e690939ef4c7c68255f5901..f9c5b00027151265df5f956ca289927111ec2ae6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2009-09-11  Glenn Morris  <rgm@gnu.org>
+
+       * apropos.el (apropos-documentation-check-doc-file): Exclude unbound
+       functions and variables, since they must be stuff specific to some other
+       platform.
+       (apropos-print): Make mouse-click message less specific about button.
+
+       * emacs-lisp/cl-macs.el (define-compiler-macro): Add a property
+       that records where a macro was defined.
+       * help-fns.el (describe-function-1): Mention if a function has a
+       compiler-macro.
+       * help-mode.el (help-function-cmacro): New button.
+
+       * locate.el (top-level): Always require dired.
+       (locate-mode-map): Initialize inside the defvar.
+
+       * net/ange-ftp.el (dired-compress-file): Declare.
+       (ange-ftp-dired-compress-file): Add doc string.
+
+       * term/ns-win.el (x-display-name, x-setup-function-keys):
+       Unify doc-strings with X versions.
+
 2009-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emulation/crisp.el (crisp-mode-map): Move initialization

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index a92a5c5305d29f5960fa08a967d44d22d696e6ec..dd40b4b32f67d786e36d0e0f82a3d221b95ed445 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -101,7 +101,9 @@
 
 ;; Set (but not used?) in frame.el.
 (defvar x-display-name nil
-  "The name of the Nextstep display on which Emacs was started.")
+  "The name of the window display on which Emacs was started.
+On X, the display name of individual X frames is recorded in the
+`display' frame parameter.")
 
 ;; nsterm.m.
 (defvar ns-input-file)
@@ -309,7 +311,7 @@ The properties returned may include `top', `left', `height', and `width'."
 (defalias 'do-applescript 'ns-do-applescript)
 
 (defun x-setup-function-keys (frame)
-  "Set up function keys on the graphical frame FRAME."
+  "Set up `function-key-map' on the graphical frame FRAME."
   (unless (terminal-parameter frame 'x-setup-function-keys)
     (with-selected-frame frame
       (setq interprogram-cut-function 'x-select-text