Commit bb16bffb authored by Stefan Monnier's avatar Stefan Monnier

Indentation, punctuation, and other nitpicks.

parent 5bfcb88c
...@@ -2514,7 +2514,8 @@ non-nil value, that slot cannot be set via `setf'. ...@@ -2514,7 +2514,8 @@ non-nil value, that slot cannot be set via `setf'.
',accessor ',name)))) ',accessor ',name))))
,(if (eq type 'vector) `(aref cl-x ,pos) ,(if (eq type 'vector) `(aref cl-x ,pos)
(if (= pos 0) '(car cl-x) (if (= pos 0) '(car cl-x)
`(nth ,pos cl-x)))) forms) `(nth ,pos cl-x))))
forms)
(push (cons accessor t) side-eff) (push (cons accessor t) side-eff)
(if (cadr (memq :read-only (cddr desc))) (if (cadr (memq :read-only (cddr desc)))
(push `(gv-define-expander ,accessor (push `(gv-define-expander ,accessor
......
...@@ -679,7 +679,8 @@ When 0, do not auto-reconnect." ...@@ -679,7 +679,8 @@ When 0, do not auto-reconnect."
(format "%s: %s (%S)" (format "%s: %s (%S)"
(process-name process) (process-name process)
sentinel sentinel
(process-status process)) (not rcirc-target)) (process-status process))
(not rcirc-target))
(rcirc-disconnect-buffer))) (rcirc-disconnect-buffer)))
(when (and (string= sentinel "deleted") (when (and (string= sentinel "deleted")
(< 0 rcirc-reconnect-delay)) (< 0 rcirc-reconnect-delay))
......
...@@ -910,7 +910,7 @@ See `sh-feature'.") ...@@ -910,7 +910,7 @@ See `sh-feature'.")
(:foreground "tan1" )) (:foreground "tan1" ))
(t (t
(:weight bold))) (:weight bold)))
"Face to show a here-document" "Face to show a here-document."
:group 'sh-indentation) :group 'sh-indentation)
;; These colors are probably icky. It's just a placeholder though. ;; These colors are probably icky. It's just a placeholder though.
...@@ -921,7 +921,7 @@ See `sh-feature'.") ...@@ -921,7 +921,7 @@ See `sh-feature'.")
(:foreground "magenta")) (:foreground "magenta"))
(t (t
(:weight bold))) (:weight bold)))
"Face to show quoted execs like ``" "Face to show quoted execs like `blabla`."
:group 'sh-indentation) :group 'sh-indentation)
(define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1") (define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1")
(defvar sh-heredoc-face 'sh-heredoc) (defvar sh-heredoc-face 'sh-heredoc)
......
...@@ -105,9 +105,9 @@ static _Noreturn void vfatal (const char *str, va_list ap) ...@@ -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) #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; struct tty_display_info *tty_list;
/* Meaning of bits in no_color_video. Each bit set means that the /* 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) ...@@ -4042,10 +4042,10 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
open a frame on the same terminal. */ open a frame on the same terminal. */
int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY); int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY);
int fd = emacs_open (name, flags, 0); int fd = emacs_open (name, flags, 0);
tty->input = tty->output = tty->input = tty->output
((fd < 0 || ! isatty (fd)) = ((fd < 0 || ! isatty (fd))
? NULL ? NULL
: fdopen (fd, "w+")); : fdopen (fd, "w+"));
if (! tty->input) if (! tty->input)
{ {
...@@ -4460,7 +4460,7 @@ fatal (const char *str, ...) ...@@ -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 static void
delete_tty (struct terminal *terminal) delete_tty (struct terminal *terminal)
...@@ -4485,7 +4485,7 @@ delete_tty (struct terminal *terminal) ...@@ -4485,7 +4485,7 @@ delete_tty (struct terminal *terminal)
; ;
if (! p) if (! p)
/* This should not happen. */ /* This should not happen. */
emacs_abort (); emacs_abort ();
p->next = tty->next; p->next = tty->next;
...@@ -4493,7 +4493,7 @@ delete_tty (struct terminal *terminal) ...@@ -4493,7 +4493,7 @@ delete_tty (struct terminal *terminal)
} }
/* reset_sys_modes needs a valid device, so this call needs to be /* reset_sys_modes needs a valid device, so this call needs to be
before delete_terminal. */ before delete_terminal. */
reset_sys_modes (tty); reset_sys_modes (tty);
delete_terminal (terminal); delete_terminal (terminal);
......
...@@ -28,13 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -28,13 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "coding.h" #include "coding.h"
#include "keyboard.h" #include "keyboard.h"
/* Chain of all terminals currently in use. */ /* Chain of all terminals currently in use. */
struct terminal *terminal_list; struct terminal *terminal_list;
/* The first unallocated terminal id. */ /* The first unallocated terminal id. */
static int next_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; struct terminal *initial_terminal;
static Lisp_Object Qterminal_live_p; static Lisp_Object Qterminal_live_p;
...@@ -121,9 +121,9 @@ raw_cursor_to (struct frame *f, int row, int col) ...@@ -121,9 +121,9 @@ raw_cursor_to (struct frame *f, int row, int col)
(*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row, 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 void
clear_to_end (struct frame *f) clear_to_end (struct frame *f)
{ {
...@@ -131,7 +131,7 @@ clear_to_end (struct frame *f) ...@@ -131,7 +131,7 @@ clear_to_end (struct frame *f)
(*FRAME_TERMINAL (f)->clear_to_end_hook) (f); (*FRAME_TERMINAL (f)->clear_to_end_hook) (f);
} }
/* Clear entire frame */ /* Clear entire frame. */
void void
clear_frame (struct frame *f) clear_frame (struct frame *f)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment