summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-07-20 21:41:59 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-07-20 21:41:59 -0400
commitbb16bffbd20705fcfbbb17189f20b838eaf7d31e (patch)
treed1217d69a114ea09b8d67bf34a03747174ee3c16
parent5bfcb88ced494a272045da30891cacc838276bd7 (diff)
downloademacs-bb16bffbd20705fcfbbb17189f20b838eaf7d31e.tar.gz
Indentation, punctuation, and other nitpicks.
-rw-r--r--lisp/emacs-lisp/cl-macs.el3
-rw-r--r--lisp/net/rcirc.el3
-rw-r--r--lisp/progmodes/sh-script.el4
-rw-r--r--src/term.c18
-rw-r--r--src/terminal.c12
5 files changed, 21 insertions, 19 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 0a426d17096..e4a73d1a4de 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2514,7 +2514,8 @@ non-nil value, that slot cannot be set via `setf'.
',accessor ',name))))
,(if (eq type 'vector) `(aref cl-x ,pos)
(if (= pos 0) '(car cl-x)
- `(nth ,pos cl-x)))) forms)
+ `(nth ,pos cl-x))))
+ forms)
(push (cons accessor t) side-eff)
(if (cadr (memq :read-only (cddr desc)))
(push `(gv-define-expander ,accessor
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9f2b4bb85db..f06f8bd292e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -679,7 +679,8 @@ When 0, do not auto-reconnect."
(format "%s: %s (%S)"
(process-name process)
sentinel
- (process-status process)) (not rcirc-target))
+ (process-status process))
+ (not rcirc-target))
(rcirc-disconnect-buffer)))
(when (and (string= sentinel "deleted")
(< 0 rcirc-reconnect-delay))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index dd1057ebf8d..3b0550dccca 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -910,7 +910,7 @@ See `sh-feature'.")
(:foreground "tan1" ))
(t
(:weight bold)))
- "Face to show a here-document"
+ "Face to show a here-document."
:group 'sh-indentation)
;; These colors are probably icky. It's just a placeholder though.
@@ -921,7 +921,7 @@ See `sh-feature'.")
(:foreground "magenta"))
(t
(:weight bold)))
- "Face to show quoted execs like ``"
+ "Face to show quoted execs like `blabla`."
:group 'sh-indentation)
(define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1")
(defvar sh-heredoc-face 'sh-heredoc)
diff --git a/src/term.c b/src/term.c
index b608ebf0da9..9081790745c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -105,9 +105,9 @@ static _Noreturn void vfatal (const char *str, va_list ap)
#define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0)
-/* Display space properties */
+/* Display space properties. */
-/* Chain of all tty device parameters. */
+/* Chain of all tty device parameters. */
struct tty_display_info *tty_list;
/* Meaning of bits in no_color_video. Each bit set means that the
@@ -4042,10 +4042,10 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
open a frame on the same terminal. */
int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY);
int fd = emacs_open (name, flags, 0);
- tty->input = tty->output =
- ((fd < 0 || ! isatty (fd))
- ? NULL
- : fdopen (fd, "w+"));
+ tty->input = tty->output
+ = ((fd < 0 || ! isatty (fd))
+ ? NULL
+ : fdopen (fd, "w+"));
if (! tty->input)
{
@@ -4460,7 +4460,7 @@ fatal (const char *str, ...)
-/* Delete the given tty terminal, closing all frames on it. */
+/* Delete the given tty terminal, closing all frames on it. */
static void
delete_tty (struct terminal *terminal)
@@ -4485,7 +4485,7 @@ delete_tty (struct terminal *terminal)
;
if (! p)
- /* This should not happen. */
+ /* This should not happen. */
emacs_abort ();
p->next = tty->next;
@@ -4493,7 +4493,7 @@ delete_tty (struct terminal *terminal)
}
/* reset_sys_modes needs a valid device, so this call needs to be
- before delete_terminal. */
+ before delete_terminal. */
reset_sys_modes (tty);
delete_terminal (terminal);
diff --git a/src/terminal.c b/src/terminal.c
index 23455262cb3..a827677a58d 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -28,13 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "coding.h"
#include "keyboard.h"
-/* Chain of all terminals currently in use. */
+/* Chain of all terminals currently in use. */
struct terminal *terminal_list;
-/* The first unallocated terminal id. */
+/* The first unallocated terminal id. */
static int next_terminal_id;
-/* The initial terminal device, created by initial_term_init. */
+/* The initial terminal device, created by initial_term_init. */
struct terminal *initial_terminal;
static Lisp_Object Qterminal_live_p;
@@ -121,9 +121,9 @@ raw_cursor_to (struct frame *f, int row, int col)
(*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row, col);
}
-/* Erase operations */
+/* Erase operations. */
-/* Clear from cursor to end of frame. */
+/* Clear from cursor to end of frame. */
void
clear_to_end (struct frame *f)
{
@@ -131,7 +131,7 @@ clear_to_end (struct frame *f)
(*FRAME_TERMINAL (f)->clear_to_end_hook) (f);
}
-/* Clear entire frame */
+/* Clear entire frame. */
void
clear_frame (struct frame *f)