diff options
| author | Glenn Morris | 2012-03-25 18:35:47 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-03-25 18:35:47 -0700 |
| commit | 02243d9dc1b91f929ea0052e5079ca5c41fd99c0 (patch) | |
| tree | 6d44b7d0595a0e88c1a704e14b10cdaae6553e84 /lisp | |
| parent | 33da7b164bf352bdef4a8b0cf91a353f99a1c9ff (diff) | |
| download | emacs-02243d9dc1b91f929ea0052e5079ca5c41fd99c0.tar.gz emacs-02243d9dc1b91f929ea0052e5079ca5c41fd99c0.zip | |
More small edits for lispref/os.texi
* doc/lispref/os.texi (Killing Emacs): Copyedits.
(Suspending Emacs): Copyedits. Mention not very relevant with GUIs.
Shorten the example, use more standard shell prompts.
* lisp/files.el (save-buffers-kill-emacs): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0903c2c2fd5..799024ae422 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-03-26 Glenn Morris <rgm@gnu.org> | 1 | 2012-03-26 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * files.el (save-buffers-kill-emacs): Doc fix. | ||
| 4 | |||
| 3 | * startup.el (normal-top-level, command-line, command-line-1): | 5 | * startup.el (normal-top-level, command-line, command-line-1): |
| 4 | Give them doc strings. | 6 | Give them doc strings. |
| 5 | 7 | ||
diff --git a/lisp/files.el b/lisp/files.el index 8c61c288be9..b3fc0766ac5 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -6290,7 +6290,11 @@ be a predicate function such as `yes-or-no-p'." | |||
| 6290 | 6290 | ||
| 6291 | (defun save-buffers-kill-emacs (&optional arg) | 6291 | (defun save-buffers-kill-emacs (&optional arg) |
| 6292 | "Offer to save each buffer, then kill this Emacs process. | 6292 | "Offer to save each buffer, then kill this Emacs process. |
| 6293 | With prefix ARG, silently save all file-visiting buffers, then kill." | 6293 | With prefix ARG, silently save all file-visiting buffers without asking. |
| 6294 | If there are active processes where `process-query-on-exit-flag' | ||
| 6295 | returns non-nil, asks whether processes should be killed. | ||
| 6296 | Runs the members of `kill-emacs-query-functions' in turn and stops | ||
| 6297 | if any returns nil. If `confirm-kill-emacs' is non-nil, calls it." | ||
| 6294 | (interactive "P") | 6298 | (interactive "P") |
| 6295 | (save-some-buffers arg t) | 6299 | (save-some-buffers arg t) |
| 6296 | (and (or (not (memq t (mapcar (function | 6300 | (and (or (not (memq t (mapcar (function |