Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

white space and formatting

  • Loading branch information...
commit c3837d570f2d680e99d032323b74dc4f80e1e6c0 1 parent 2f2b1dd
John SJ Anderson authored
2  bin/build-most-recent-emacs
@@ -49,7 +49,7 @@ $^O eq 'darwin'
49 49 say "\n* CLEANING UP..." if $VERBOSE;
50 50 unlink( $tarball_file );
51 51
52   -chdir('/'); # so File::Temp can clean up on exit
  52 +chdir('/'); # so File::Temp can clean up on exit
53 53
54 54 say "done.";
55 55
1  bin/check-emacs
... ... @@ -1,4 +1,3 @@
1 1 #! /bin/sh
2 2
3 3 emacs -q --eval '(condition-case err (progn (load "~/.emacs.d/init.el") (kill-emacs 0)) (error (kill-emacs 1)))'
4   -
56 etc/builtins.el
@@ -48,7 +48,7 @@
48 48 (require 'font-lock)
49 49 (global-font-lock-mode 1)
50 50 (setq-default font-lock-maximum-decoration t
51   - font-lock-maximum-size nil)
  51 + font-lock-maximum-size nil)
52 52 (setq jit-lock-stealth-time 5
53 53 jit-lock-defer-contextually t
54 54 jit-lock-stealth-nice 0.5)
@@ -95,8 +95,8 @@ remove-leading-whitespace-on-kil-line tricks")
95 95 (setq auto-revert-verbose nil)
96 96
97 97 ;;; HIGHLIGHTING
98   -;(set-face-foreground 'highlight "gray10")
99   -;(set-face-background 'highlight "yellow")
  98 +;;(set-face-foreground 'highlight "gray10")
  99 +;;(set-face-background 'highlight "yellow")
100 100
101 101 ;;; HTML
102 102 (add-to-list 'auto-mode-alist '("\\.tt2?$" . html-mode))
@@ -123,32 +123,32 @@ remove-leading-whitespace-on-kil-line tricks")
123 123 (interactive)
124 124 (imenu--make-index-alist)
125 125 (let ((name-and-pos '())
126   - (symbol-names '()))
  126 + (symbol-names '()))
127 127 (flet ((addsymbols (symbol-list)
128   - (when (listp symbol-list)
129   - (dolist (symbol symbol-list)
130   - (let ((name nil) (position nil))
131   - (cond
132   - ((and (listp symbol) (imenu--subalist-p symbol))
133   - (addsymbols symbol))
134   - ((listp symbol)
135   - (setq name (car symbol))
136   - (setq position (cdr symbol)))
137   - ((stringp symbol)
138   - (setq name symbol)
139   - (setq position (get-text-property 1 'org-imenu-marker symbol))))
140   - (unless (or (null position) (null name))
141   - (add-to-list 'symbol-names name)
142   - (add-to-list 'name-and-pos (cons name position))))))))
  128 + (when (listp symbol-list)
  129 + (dolist (symbol symbol-list)
  130 + (let ((name nil) (position nil))
  131 + (cond
  132 + ((and (listp symbol) (imenu--subalist-p symbol))
  133 + (addsymbols symbol))
  134 + ((listp symbol)
  135 + (setq name (car symbol))
  136 + (setq position (cdr symbol)))
  137 + ((stringp symbol)
  138 + (setq name symbol)
  139 + (setq position (get-text-property 1 'org-imenu-marker symbol))))
  140 + (unless (or (null position) (null name))
  141 + (add-to-list 'symbol-names name)
  142 + (add-to-list 'name-and-pos (cons name position))))))))
143 143 (addsymbols imenu--index-alist))
144 144 (let* ((selected-symbol (ido-completing-read "Symbol? " symbol-names))
145   - (position (cdr (assoc selected-symbol name-and-pos))))
  145 + (position (cdr (assoc selected-symbol name-and-pos))))
146 146 (if (markerp position)
147   - (goto-char position) (goto-char (overlay-start position))))))
  147 + (goto-char position) (goto-char (overlay-start position))))))
148 148
149 149 ;;; ISEARCH
150   -;(set-face-foreground 'isearch "white")
151   -;(set-face-background 'isearch "red")
  150 +;;(set-face-foreground 'isearch "white")
  151 +;;(set-face-background 'isearch "red")
152 152
153 153 ;;; ISWITCH
154 154 (require 'iswitchb)
@@ -179,7 +179,7 @@ This is a buffer-local variable.")
179 179 (setq mac-function-modifier 'super)
180 180 (setq mac-option-modifier nil)
181 181 (add-to-list 'ido-ignore-files "\\.DS_Store")
182   -;; (ns-toggle-fullscreen)
  182 + ;; (ns-toggle-fullscreen)
183 183 (setq browse-url-browser-function 'browse-url-default-macosx-browser)
184 184 (setq delete-by-moving-to-trash t))
185 185
@@ -192,8 +192,8 @@ This is a buffer-local variable.")
192 192 (if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
193 193
194 194 ;;; MODE LINE FACES
195   -;(set-face-background 'mode-line "black")
196   -;(set-face-foreground 'mode-line "yellow2")
  195 +;;(set-face-background 'mode-line "black")
  196 +;;(set-face-foreground 'mode-line "yellow2")
197 197
198 198 ;;; NXML-MODE
199 199 (fset 'xml-mode 'nxml-mode)
@@ -217,7 +217,7 @@ This is a buffer-local variable.")
217 217 "/opt/git/bin"
218 218 "/opt/perl/bin"
219 219 "/usr/local/bin"
220   - )
  220 + )
221 221 "extra elements to add to exec-path")
222 222 (dolist (path genehack/extra-paths)
223 223 (message path)
@@ -247,7 +247,7 @@ This is a buffer-local variable.")
247 247
248 248 ;;; SCRATCH BUFFER
249 249 (setq initial-scratch-message
250   - "welcome to john's emacs.\n\nput additional stuff in initial-scratch-message to have it show up here.\n\n")
  250 + "welcome to john's emacs.\n\nput additional stuff in initial-scratch-message to have it show up here.\n\n")
251 251
252 252 ;;; SERVER
253 253 (server-start)
2  etc/misc.el
@@ -246,7 +246,7 @@
246 246 (defun genehack/paren-bounce ()
247 247 (interactive)
248 248 (let ((prev-char (char-to-string (preceding-char)))
249   - (next-char (char-to-string (following-char))))
  249 + (next-char (char-to-string (following-char))))
250 250 (cond ((string-match "[[{(<]" next-char) (forward-sexp 1))
251 251 ((string-match "[\]})>]" prev-char) (backward-sexp 1))
252 252 (t (error "%s" "Not an expression boundary.")))))
46 etc/perl.el
@@ -24,41 +24,39 @@
24 24
25 25 ;;; CONFIG
26 26 (setq
27   - cperl-auto-newline t
28 27 cperl-auto-indent-on-semi t
  28 + cperl-auto-newline t
  29 + cperl-clobber-lisp-bindings t
29 30 cperl-close-paren-offset -2
30 31 cperl-continued-statement-offset 2
31   - ;cperl-hairy t
  32 + cperl-electric-keywords t
  33 + cperl-electric-lbrace-space nil
  34 + cperl-electric-linefeed t
  35 + cperl-electric-parens nil
  36 + cperl-font-lock t
32 37 cperl-highlight-variables-indiscriminately t
33 38 cperl-indent-level 2
34 39 cperl-indent-parens-as-block t
35   - cperl-invalid-face nil
36   - cperl-tab-always-indent t
37   - cperl-electric-lbrace-space nil ; must needs be after cperl-hairy
38   - cperl-clobber-lisp-bindings nil ; must needs be after cperl-hairy
39   -
40   - cperl-electric-parens nil
41   - cperl-font-lock t
42   - cperl-electric-linefeed t
43   - cperl-electric-keywords t
  40 + cperl-indent-region-fix-constructs nil
44 41 cperl-info-on-command-no-prompt t
45   - cperl-clobber-lisp-bindings t
  42 + cperl-invalid-face nil
46 43 cperl-lazy-help-time 5
  44 + cperl-tab-always-indent t
47 45 )
48 46
49 47 (defvar genehack/cperl-keybindings-to-remove
50 48 '(
51   - "\C-c\C-a"
52   - "\C-c\C-b"
53   - "\C-c\C-d"
54   - "\C-c\C-hP"
55   - "\C-c\C-ha"
56   - "\C-c\C-hp"
57   - "\C-c\C-j"
58   - "\C-c\C-t"
59   - "\C-c\C-v"
60   - "\C-c\C-x"
61   - ) "list of keybindings to unset in cperl-mode buffers
  49 + "\C-c\C-a"
  50 + "\C-c\C-b"
  51 + "\C-c\C-d"
  52 + "\C-c\C-hP"
  53 + "\C-c\C-ha"
  54 + "\C-c\C-hp"
  55 + "\C-c\C-j"
  56 + "\C-c\C-t"
  57 + "\C-c\C-v"
  58 + "\C-c\C-x"
  59 + ) "list of keybindings to unset in cperl-mode buffers
62 60 since cperl-mode steps on a lot of the C-c C-* bindings I use globallly..." )
63 61
64 62 ;;; perl COMPLETION
@@ -97,7 +95,7 @@ or vice versa."
97 95
98 96 (defun genehack/cperl-mode-setup ()
99 97 ;; allows 'M-x compile' for syntax checking of Perl scripts within Emacs
100   - ;; from e.goerlach@computer.org (Ekkehard Grlach) in comp.emacs
  98 + ;; from e.goerlach@computer.org (Ekkehard Görlach) in comp.emacs
101 99 (set (make-local-variable 'compile-command)
102 100 (concat "perl -cw " buffer-file-name))
103 101 (font-lock-add-keywords nil '(("^[^\n]\\{90\\}\\(.*\\)$" 1 font-lock-warning-face t)))
10 init.el
@@ -129,11 +129,11 @@
129 129 (dolist (pkg genehack/package-list)
130 130 (if (not (package-installed-p pkg))
131 131 (progn
132   - (if (not (eq genehack/packages-refreshed t))
133   - (progn
134   - (package-refresh-contents)
135   - (setq genehack/packages-refreshed t)))
136   - (package-install pkg))))
  132 + (if (not (eq genehack/packages-refreshed t))
  133 + (progn
  134 + (package-refresh-contents)
  135 + (setq genehack/packages-refreshed t)))
  136 + (package-install pkg))))
137 137
138 138 ;; PATH FIX FOR MACOS X
139 139 (when (memq window-system '(mac ns))

0 comments on commit c3837d5

Please sign in to comment.
Something went wrong with that request. Please try again.