emacs, emacsclient: refresh (#6096)

pages/common/emacs.md

@@ -1,24 +1,33 @@
 # emacs
 
 > The extensible, customizable, self-documenting, real-time display editor.
+> See also `emacsclient`.
 > More information: <https://www.gnu.org/software/emacs>.
 
-- Start in console mode (without X window):
-
-`emacs -nw`
-
-- Open a file:
+- Start Emacs and open a file:
 
 `emacs {{path/to/file}}`
 
-- Save a file:
-
-`Ctrl + X, Ctrl + S`
-
-- Quit:
-
-`Ctrl + X, Ctrl + C`
-
 - Open a file at a specified line number:
 
 `emacs +{{line_number}} {{path/to/file}}`
+
+- Start Emacs in console mode (without an X window):
+
+`emacs --no-window-system`
+
+- Start an Emacs server in the background (accessible via `emacsclient`):
+
+`emacs --daemon`
+
+- Stop a running Emacs server and all its instances, asking for confirmation on unsaved files:
+
+`emacsclient --eval '(save-buffers-kill-emacs)'`
+
+- Save a file in Emacs:
+
+`Ctrl + X, Ctrl + S`
+
+- Quit Emacs:
+
+`Ctrl + X, Ctrl + C`

pages/common/emacsclient.md

@@ -1,24 +1,29 @@
 # emacsclient
 
-> Open files in an existing emacs server.
+> Open files in an existing Emacs server.
+> See also `emacs`.
 > More information: <https://www.emacswiki.org/emacs/EmacsClient>.
 
-- Open files in an existing Emacs server (using GUI if available):
+- Open a file in an existing Emacs server (using GUI if available):
 
-`emacsclient {{filename}}`
+`emacsclient {{path/to/file}}`
 
-- Open file in console mode (without X window):
+- Open a file in console mode (without an X window):
 
-`emacsclient -nw {{filename}}`
+`emacsclient --no-window-system {{path/to/file}}`
 
-- Open a file in an existing emacs frame and return immediately:
+- Open a file in a new Emacs window:
 
-`emacsclient -n {{filename}}`
+`emacsclient --create-frame {{path/to/file}}`
 
-- Open file in a new emacs frame:
+- Evaluate a command, printing the output to stdout, and then quit:
 
-`emacsclient -c {{filename}}`
+`emacsclient --eval '({{command}})'`
 
-- Evaluate command in a new emacs frame:
+- Specify an alternative editor in case no Emacs server is running:
 
-`emacsclient -c -e '({{command}})'`
+`emacsclient --alternate-editor {{editor}} {{path/to/file}}`
+
+- Stop a running Emacs server and all its instances, asking for confirmation on unsaved files:
+
+`emacsclient --eval '(save-buffers-kill-emacs)'`