aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2014-07-20 21:41:59 -0400
committerStefan Monnier2014-07-20 21:41:59 -0400
commitbb16bffbd20705fcfbbb17189f20b838eaf7d31e (patch)
treed1217d69a114ea09b8d67bf34a03747174ee3c16 /lisp
parent5bfcb88ced494a272045da30891cacc838276bd7 (diff)
downloademacs-bb16bffbd20705fcfbbb17189f20b838eaf7d31e.tar.gz
emacs-bb16bffbd20705fcfbbb17189f20b838eaf7d31e.zip
Indentation, punctuation, and other nitpicks.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/cl-macs.el3
-rw-r--r--lisp/net/rcirc.el3
-rw-r--r--lisp/progmodes/sh-script.el4
3 files changed, 6 insertions, 4 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'.
2514 ',accessor ',name)))) 2514 ',accessor ',name))))
2515 ,(if (eq type 'vector) `(aref cl-x ,pos) 2515 ,(if (eq type 'vector) `(aref cl-x ,pos)
2516 (if (= pos 0) '(car cl-x) 2516 (if (= pos 0) '(car cl-x)
2517 `(nth ,pos cl-x)))) forms) 2517 `(nth ,pos cl-x))))
2518 forms)
2518 (push (cons accessor t) side-eff) 2519 (push (cons accessor t) side-eff)
2519 (if (cadr (memq :read-only (cddr desc))) 2520 (if (cadr (memq :read-only (cddr desc)))
2520 (push `(gv-define-expander ,accessor 2521 (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."
679 (format "%s: %s (%S)" 679 (format "%s: %s (%S)"
680 (process-name process) 680 (process-name process)
681 sentinel 681 sentinel
682 (process-status process)) (not rcirc-target)) 682 (process-status process))
683 (not rcirc-target))
683 (rcirc-disconnect-buffer))) 684 (rcirc-disconnect-buffer)))
684 (when (and (string= sentinel "deleted") 685 (when (and (string= sentinel "deleted")
685 (< 0 rcirc-reconnect-delay)) 686 (< 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'.")
910 (:foreground "tan1" )) 910 (:foreground "tan1" ))
911 (t 911 (t
912 (:weight bold))) 912 (:weight bold)))
913 "Face to show a here-document" 913 "Face to show a here-document."
914 :group 'sh-indentation) 914 :group 'sh-indentation)
915 915
916;; These colors are probably icky. It's just a placeholder though. 916;; These colors are probably icky. It's just a placeholder though.
@@ -921,7 +921,7 @@ See `sh-feature'.")
921 (:foreground "magenta")) 921 (:foreground "magenta"))
922 (t 922 (t
923 (:weight bold))) 923 (:weight bold)))
924 "Face to show quoted execs like ``" 924 "Face to show quoted execs like `blabla`."
925 :group 'sh-indentation) 925 :group 'sh-indentation)
926(define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1") 926(define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1")
927(defvar sh-heredoc-face 'sh-heredoc) 927(defvar sh-heredoc-face 'sh-heredoc)