diff options
| author | Paul Eggert | 2015-11-17 15:28:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-11-17 15:29:35 -0800 |
| commit | ac16149ba470ae8a625d42a61adbb6e84254c675 (patch) | |
| tree | 9575cf0f1c5139a1943f9a18dd444ddc46983aa9 /src | |
| parent | abf673af29ba2a2e0001ebd1db183377724f0cc4 (diff) | |
| download | emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.tar.gz emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.zip | |
Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
Most of these fixes are to documentation; many involve fixing
longstanding quoting glitches that are independent of the
recent substitute-command-keys changes. The changes to code are:
* lisp/cedet/mode-local.el (mode-local-augment-function-help)
(describe-mode-local-overload):
Substitute docstrings before displaying them.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
Quote the generated docstring for later substitution.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 16 | ||||
| -rw-r--r-- | src/fns.c | 2 | ||||
| -rw-r--r-- | src/frame.c | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 64c84aec6f9..1d30eee2082 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -6206,10 +6206,10 @@ It is up to you to set this variable if your terminal can do that. */); | |||
| 6206 | doc: /* Name of the window system that Emacs uses for the first frame. | 6206 | doc: /* Name of the window system that Emacs uses for the first frame. |
| 6207 | The value is a symbol: | 6207 | The value is a symbol: |
| 6208 | nil for a termcap frame (a character-only terminal), | 6208 | nil for a termcap frame (a character-only terminal), |
| 6209 | 'x' for an Emacs frame that is really an X window, | 6209 | `x' for an Emacs frame that is really an X window, |
| 6210 | 'w32' for an Emacs frame that is a window on MS-Windows display, | 6210 | `w32' for an Emacs frame that is a window on MS-Windows display, |
| 6211 | 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | 6211 | `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, |
| 6212 | 'pc' for a direct-write MS-DOS frame. | 6212 | `pc' for a direct-write MS-DOS frame. |
| 6213 | 6213 | ||
| 6214 | Use of this variable as a boolean is deprecated. Instead, | 6214 | Use of this variable as a boolean is deprecated. Instead, |
| 6215 | use `display-graphic-p' or any of the other `display-*-p' | 6215 | use `display-graphic-p' or any of the other `display-*-p' |
| @@ -6219,10 +6219,10 @@ predicates which report frame's specific UI-related capabilities. */); | |||
| 6219 | doc: /* Name of window system through which the selected frame is displayed. | 6219 | doc: /* Name of window system through which the selected frame is displayed. |
| 6220 | The value is a symbol: | 6220 | The value is a symbol: |
| 6221 | nil for a termcap frame (a character-only terminal), | 6221 | nil for a termcap frame (a character-only terminal), |
| 6222 | 'x' for an Emacs frame that is really an X window, | 6222 | `x' for an Emacs frame that is really an X window, |
| 6223 | 'w32' for an Emacs frame that is a window on MS-Windows display, | 6223 | `w32' for an Emacs frame that is a window on MS-Windows display, |
| 6224 | 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | 6224 | `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, |
| 6225 | 'pc' for a direct-write MS-DOS frame. | 6225 | `pc' for a direct-write MS-DOS frame. |
| 6226 | 6226 | ||
| 6227 | Use of this variable as a boolean is deprecated. Instead, | 6227 | Use of this variable as a boolean is deprecated. Instead, |
| 6228 | use `display-graphic-p' or any of the other `display-*-p' | 6228 | use `display-graphic-p' or any of the other `display-*-p' |
| @@ -338,7 +338,7 @@ This function obeys the conventions for collation order in your | |||
| 338 | locale settings. For example, punctuation and whitespace characters | 338 | locale settings. For example, punctuation and whitespace characters |
| 339 | might be considered less significant for sorting: | 339 | might be considered less significant for sorting: |
| 340 | 340 | ||
| 341 | (sort '("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) | 341 | (sort \\='("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) |
| 342 | => ("11" "1 1" "1.1" "12" "1 2" "1.2") | 342 | => ("11" "1 1" "1.1" "12" "1 2" "1.2") |
| 343 | 343 | ||
| 344 | The optional argument LOCALE, a string, overrides the setting of your | 344 | The optional argument LOCALE, a string, overrides the setting of your |
diff --git a/src/frame.c b/src/frame.c index 78f8ff71be3..c388986e351 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -239,10 +239,10 @@ DEFUN ("framep", Fframep, Sframep, 1, 1, 0, | |||
| 239 | doc: /* Return non-nil if OBJECT is a frame. | 239 | doc: /* Return non-nil if OBJECT is a frame. |
| 240 | Value is: | 240 | Value is: |
| 241 | t for a termcap frame (a character-only terminal), | 241 | t for a termcap frame (a character-only terminal), |
| 242 | 'x' for an Emacs frame that is really an X window, | 242 | `x' for an Emacs frame that is really an X window, |
| 243 | 'w32' for an Emacs frame that is a window on MS-Windows display, | 243 | `w32' for an Emacs frame that is a window on MS-Windows display, |
| 244 | 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | 244 | `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, |
| 245 | 'pc' for a direct-write MS-DOS frame. | 245 | `pc' for a direct-write MS-DOS frame. |
| 246 | See also `frame-live-p'. */) | 246 | See also `frame-live-p'. */) |
| 247 | (Lisp_Object object) | 247 | (Lisp_Object object) |
| 248 | { | 248 | { |
| @@ -284,10 +284,10 @@ DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, | |||
| 284 | doc: /* The name of the window system that FRAME is displaying through. | 284 | doc: /* The name of the window system that FRAME is displaying through. |
| 285 | The value is a symbol: | 285 | The value is a symbol: |
| 286 | nil for a termcap frame (a character-only terminal), | 286 | nil for a termcap frame (a character-only terminal), |
| 287 | 'x' for an Emacs frame that is really an X window, | 287 | `x' for an Emacs frame that is really an X window, |
| 288 | 'w32' for an Emacs frame that is a window on MS-Windows display, | 288 | `w32' for an Emacs frame that is a window on MS-Windows display, |
| 289 | 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | 289 | `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, |
| 290 | 'pc' for a direct-write MS-DOS frame. | 290 | `pc' for a direct-write MS-DOS frame. |
| 291 | 291 | ||
| 292 | FRAME defaults to the currently selected frame. | 292 | FRAME defaults to the currently selected frame. |
| 293 | 293 | ||