summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-06-15 12:19:30 +0200
committerGravatar Tom Willemsen2011-06-15 12:19:30 +0200
commit9df6bb4922d08a9db2233f738b691eebc6e3120a (patch)
tree4f4a39aa28b1eb5c3afcbf5c941bc7dbfdc3cf1f /emacs.d
parentc608291b013290b80f6aaf71ec6d0abc4b13c87f (diff)
downloaddotfiles-9df6bb4922d08a9db2233f738b691eebc6e3120a.tar.gz
dotfiles-9df6bb4922d08a9db2233f738b691eebc6e3120a.zip
EMACS: compile, htmlize, js, stumpwm
* install.sh tries to compile emacs.el before linking the emacs.elc to ~/. This is to always have a compiled .emacs.elc for speediest startup. * I removed a little bit of code from htmlize.el that was causing trouble with the naquadah theme. * I removed javascript-mode, because the built-in js-mode is better. * I Added stumpwm mode * When I save a file and it is in html-mode it will try and replace all occurrences of é with é before continueing.
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/elisp/htmlize.el16
-rw-r--r--emacs.d/elisp/javascript.el707
-rw-r--r--emacs.d/elisp/stumpwm-mode.el68
3 files changed, 76 insertions, 715 deletions
diff --git a/emacs.d/elisp/htmlize.el b/emacs.d/elisp/htmlize.el
index f3a13f6..2b1d9a7 100644
--- a/emacs.d/elisp/htmlize.el
+++ b/emacs.d/elisp/htmlize.el
@@ -581,7 +581,7 @@ without modifying their meaning."
(goto-char (point-min))
(while (search-forward "Local Variables:" nil t)
(replace-match "Local Variables:" nil t)))
-
+
;;; Color handling.
@@ -744,7 +744,7 @@ If no rgb.txt file is found, return nil."
(t
;; We're getting the RGB components from Emacs.
(let ((rgb
- ;; Here I cannot conditionalize on (fboundp ...)
+ ;; Here I cannot conditionalize on (fboundp ...)
;; because ps-print under some versions of GNU Emacs
;; defines its own dummy version of
;; `color-instance-rgb-components'.
@@ -880,10 +880,10 @@ If no rgb.txt file is found, return nil."
(setq face (face-attribute face :inherit)))
(face-attribute face attr)))))
(when (and value (not (eq value 'unspecified)))
- (htmlize-face-emacs21-attr fstruct attr value))))
- (let ((size (htmlize-face-size face)))
- (unless (eql size 1.0) ; ignore non-spec
- (setf (htmlize-fstruct-size fstruct) size))))
+ (htmlize-face-emacs21-attr fstruct attr value)))))
+ ;(let ((size (htmlize-face-size face)))
+ ; (unless (eql size 1.0) ; ignore non-spec
+ ; (setf (htmlize-fstruct-size fstruct) size))))
(setf (htmlize-fstruct-css-name fstruct) (htmlize-face-css-name face))
fstruct))
@@ -1148,7 +1148,7 @@ property and by buffer overlays that specify `face'."
;; `insert-head', `body-tag', and `insert-text'. Not all output types
;; define all methods.
;;
-;; Methods are called either with (htmlize-method METHOD ARGS...)
+;; Methods are called either with (htmlize-method METHOD ARGS...)
;; special form, or by accessing the function with
;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
;; The latter form is useful in tight loops because `htmlize-method'
@@ -1303,7 +1303,7 @@ it's called with the same value of KEY. All other times, the cached
(format "<body text=\"%s\" bgcolor=\"%s\">"
(htmlize-fstruct-foreground fstruct)
(htmlize-fstruct-background fstruct))))
-
+
(defun htmlize-font-insert-text (text fstruct-list buffer)
;; In `font' mode, we use the traditional HTML means of altering
;; presentation: <font> tag for colors, <b> for bold, <u> for
diff --git a/emacs.d/elisp/javascript.el b/emacs.d/elisp/javascript.el
deleted file mode 100644
index 33d852f..0000000
--- a/emacs.d/elisp/javascript.el
+++ /dev/null
@@ -1,707 +0,0 @@
-;;; javascript.el --- Major mode for editing JavaScript source text
-
-;; Copyright (C) 2006 Karl Landström
-
-;; Author: Karl Landström <kland@comhem.se>
-;; Maintainer: Karl Landström <kland@comhem.se>
-;; Version: 2.0 Beta 8
-;; Date: 2006-12-26
-;; Keywords: languages, oop
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-;;
-;; The main features of this JavaScript mode are syntactic
-;; highlighting (enabled with `font-lock-mode' or
-;; `global-font-lock-mode'), automatic indentation and filling of
-;; comments.
-;;
-;; This package has (only) been tested with GNU Emacs 21.4 (the latest
-;; stable release).
-;;
-;; Installation:
-;;
-;; Put this file in a directory where Emacs can find it (`C-h v
-;; load-path' for more info). Then add the following lines to your
-;; Emacs initialization file:
-;;
-;; (add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
-;; (autoload 'javascript-mode "javascript" nil t)
-;;
-;; General Remarks:
-;;
-;; This mode assumes that block comments are not nested inside block
-;; comments and that strings do not contain line breaks.
-;;
-;; Exported names start with "javascript-" whereas private names start
-;; with "js-".
-;;
-;; Changes:
-;;
-;; See javascript.el.changelog.
-
-;;; Code:
-
-(require 'cc-mode)
-(require 'font-lock)
-(require 'newcomment)
-
-(defgroup javascript nil
- "Customization variables for `javascript-mode'."
- :tag "JavaScript"
- :group 'languages)
-
-(defcustom javascript-indent-level 4
- "Number of spaces for each indentation step."
- :type 'integer
- :group 'javascript)
-
-(defcustom javascript-auto-indent-flag t
- "Automatic indentation with punctuation characters. If non-nil, the
-current line is indented when certain punctuations are inserted."
- :type 'boolean
- :group 'javascript)
-
-
-;; --- Keymap ---
-
-(defvar javascript-mode-map nil
- "Keymap used in JavaScript mode.")
-
-(unless javascript-mode-map
- (setq javascript-mode-map (make-sparse-keymap)))
-
-(when javascript-auto-indent-flag
- (mapc (lambda (key)
- (define-key javascript-mode-map key 'javascript-insert-and-indent))
- '("{" "}" "(" ")" ":" ";" ",")))
-
-(defun javascript-insert-and-indent (key)
- "Run command bound to key and indent current line. Runs the command
-bound to KEY in the global keymap and indents the current line."
- (interactive (list (this-command-keys)))
- (call-interactively (lookup-key (current-global-map) key))
- (indent-according-to-mode))
-
-
-;; --- Syntax Table And Parsing ---
-
-(defvar javascript-mode-syntax-table
- (let ((table (make-syntax-table)))
- (c-populate-syntax-table table)
-
- ;; The syntax class of underscore should really be `symbol' ("_")
- ;; but that makes matching of tokens much more complex as e.g.
- ;; "\\<xyz\\>" matches part of e.g. "_xyz" and "xyz_abc". Defines
- ;; it as word constituent for now.
- (modify-syntax-entry ?_ "w" table)
-
- table)
- "Syntax table used in JavaScript mode.")
-
-
-(defun js-re-search-forward-inner (regexp &optional bound count)
- "Auxiliary function for `js-re-search-forward'."
- (let ((parse)
- (saved-point (point-min)))
- (while (> count 0)
- (re-search-forward regexp bound)
- (setq parse (parse-partial-sexp saved-point (point)))
- (cond ((nth 3 parse)
- (re-search-forward
- (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
- (save-excursion (end-of-line) (point)) t))
- ((nth 7 parse)
- (forward-line))
- ((or (nth 4 parse)
- (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
- (re-search-forward "\\*/"))
- (t
- (setq count (1- count))))
- (setq saved-point (point))))
- (point))
-
-
-(defun js-re-search-forward (regexp &optional bound noerror count)
- "Search forward but ignore strings and comments. Invokes
-`re-search-forward' but treats the buffer as if strings and
-comments have been removed."
- (let ((saved-point (point))
- (search-expr
- (cond ((null count)
- '(js-re-search-forward-inner regexp bound 1))
- ((< count 0)
- '(js-re-search-backward-inner regexp bound (- count)))
- ((> count 0)
- '(js-re-search-forward-inner regexp bound count)))))
- (condition-case err
- (eval search-expr)
- (search-failed
- (goto-char saved-point)
- (unless noerror
- (error (error-message-string err)))))))
-
-
-(defun js-re-search-backward-inner (regexp &optional bound count)
- "Auxiliary function for `js-re-search-backward'."
- (let ((parse)
- (saved-point (point-min)))
- (while (> count 0)
- (re-search-backward regexp bound)
- (when (and (> (point) (point-min))
- (save-excursion (backward-char) (looking-at "/[/*]")))
- (forward-char))
- (setq parse (parse-partial-sexp saved-point (point)))
- (cond ((nth 3 parse)
- (re-search-backward
- (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
- (save-excursion (beginning-of-line) (point)) t))
- ((nth 7 parse)
- (goto-char (nth 8 parse)))
- ((or (nth 4 parse)
- (and (eq (char-before) ?/) (eq (char-after) ?*)))
- (re-search-backward "/\\*"))
- (t
- (setq count (1- count))))))
- (point))
-
-
-(defun js-re-search-backward (regexp &optional bound noerror count)
- "Search backward but ignore strings and comments. Invokes
-`re-search-backward' but treats the buffer as if strings and
-comments have been removed."
- (let ((saved-point (point))
- (search-expr
- (cond ((null count)
- '(js-re-search-backward-inner regexp bound 1))
- ((< count 0)
- '(js-re-search-forward-inner regexp bound (- count)))
- ((> count 0)
- '(js-re-search-backward-inner regexp bound count)))))
- (condition-case err
- (eval search-expr)
- (search-failed
- (goto-char saved-point)
- (unless noerror
- (error (error-message-string err)))))))
-
-
-(defun js-continued-var-decl-list-p ()
- "Return non-nil if point is inside a continued variable declaration
-list."
- (interactive)
- (let ((start (save-excursion (js-re-search-backward "\\<var\\>" nil t))))
- (and start
- (save-excursion (re-search-backward "\n" start t))
- (not (save-excursion
- (js-re-search-backward
- ";\\|[^, \t][ \t]*\\(/[/*]\\|$\\)" start t))))))
-
-
-;; --- Font Lock ---
-
-(defun js-inside-param-list-p ()
- "Return non-nil if point is inside a function parameter list."
- (condition-case err
- (save-excursion
- (up-list -1)
- (and (looking-at "(")
- (progn (backward-word 1)
- (or (looking-at "function")
- (progn (backward-word 1) (looking-at "function"))))))
- (error nil)))
-
-
-(defconst js-function-heading-1-re
- "^[ \t]*function[ \t]+\\(\\w+\\)"
- "Regular expression matching the start of a function header.")
-
-(defconst js-function-heading-2-re
- "^[ \t]*\\(\\w+\\)[ \t]*:[ \t]*function\\>"
- "Regular expression matching the start of a function entry in
- an associative array.")
-
-(defconst js-keyword-re
- (regexp-opt '("abstract" "break" "case" "catch" "class" "const"
- "continue" "debugger" "default" "delete" "do" "else"
- "enum" "export" "extends" "final" "finally" "for"
- "function" "goto" "if" "implements" "import" "in"
- "instanceof" "interface" "native" "new" "package"
- "private" "protected" "public" "return" "static"
- "super" "switch" "synchronized" "this" "throw"
- "throws" "transient" "try" "typeof" "var" "void"
- "volatile" "while" "with"
- "let") 'words)
- "Regular expression matching any JavaScript keyword.")
-
-(defconst js-basic-type-re
- (regexp-opt '("boolean" "byte" "char" "double" "float" "int" "long"
- "short" "void") 'words)
- "Regular expression matching any predefined type in JavaScript.")
-
-(defconst js-constant-re
- (regexp-opt '("false" "null" "true") 'words)
- "Regular expression matching any future reserved words in JavaScript.")
-
-
-(defconst js-font-lock-keywords-1
- (list
- "\\<import\\>"
- (list js-function-heading-1-re 1 font-lock-function-name-face)
- (list js-function-heading-2-re 1 font-lock-function-name-face)
- (list "[=(][ \t]*\\(/.*?[^\\]/\\w*\\)" 1 font-lock-string-face))
- "Level one font lock.")
-
-(defconst js-font-lock-keywords-2
- (append js-font-lock-keywords-1
- (list (list js-keyword-re 1 font-lock-keyword-face)
- (cons js-basic-type-re font-lock-type-face)
- (cons js-constant-re font-lock-constant-face)))
- "Level two font lock.")
-
-
-;; Limitations with variable declarations: There seems to be no
-;; sensible way to highlight variables occuring after an initialized
-;; variable in a variable list. For instance, in
-;;
-;; var x, y = f(a, b), z
-;;
-;; z will not be highlighted.
-
-(defconst js-font-lock-keywords-3
- (append
- js-font-lock-keywords-2
- (list
-
- ;; variable declarations
- (list
- (concat "\\<\\(const\\|var\\)\\>\\|" js-basic-type-re)
- (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
- nil
- nil
- '(1 font-lock-variable-name-face)))
-
- ;; continued variable declaration list
- (list
- (concat "^[ \t]*\\w+[ \t]*\\([,;=]\\|/[/*]\\|$\\)")
- (list "\\(\\w+\\)[ \t]*\\([=;].*\\|,\\|/[/*]\\|$\\)"
- '(if (save-excursion (backward-char) (js-continued-var-decl-list-p))
- (backward-word 1)
- (end-of-line))
- '(end-of-line)
- '(1 font-lock-variable-name-face)))
-
- ;; formal parameters
- (list
- (concat "\\<function\\>\\([ \t]+\\w+\\)?[ \t]*([ \t]*\\w")
- (list "\\(\\w+\\)\\([ \t]*).*\\)?"
- '(backward-char)
- '(end-of-line)
- '(1 font-lock-variable-name-face)))
-
- ;; continued formal parameter list
- (list
- (concat "^[ \t]*\\w+[ \t]*[,)]")
- (list "\\w+"
- '(if (save-excursion (backward-char) (js-inside-param-list-p))
- (backward-word 1)
- (end-of-line))
- '(end-of-line)
- '(0 font-lock-variable-name-face)))))
- "Level three font lock.")
-
-(defconst js-font-lock-keywords
- '(js-font-lock-keywords-3 js-font-lock-keywords-1 js-font-lock-keywords-2
- js-font-lock-keywords-3)
- "See `font-lock-keywords'.")
-
-
-;; --- Indentation ---
-
-(defconst js-possibly-braceless-keyword-re
- (regexp-opt
- '("catch" "do" "else" "finally" "for" "if" "try" "while" "with" "let")
- 'words)
- "Regular expression matching keywords that are optionally
- followed by an opening brace.")
-
-(defconst js-indent-operator-re
- (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
- (regexp-opt '("in" "instanceof") 'words))
- "Regular expression matching operators that affect indentation
- of continued expressions.")
-
-
-(defun js-looking-at-operator-p ()
- "Return non-nil if text after point is an operator (that is not
-a comma)."
- (save-match-data
- (and (looking-at js-indent-operator-re)
- (or (not (looking-at ":"))
- (save-excursion
- (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
- (looking-at "?")))))))
-
-
-(defun js-continued-expression-p ()
- "Returns non-nil if the current line continues an expression."
- (save-excursion
- (back-to-indentation)
- (or (js-looking-at-operator-p)
- (and (js-re-search-backward "\n" nil t)
- (progn
- (skip-chars-backward " \t")
- (backward-char)
- (and (> (point) (point-min))
- (save-excursion (backward-char) (not (looking-at "[/*]/")))
- (js-looking-at-operator-p)
- (and (progn (backward-char)
- (not (looking-at "++\\|--\\|/[/*]"))))))))))
-
-
-(defun js-end-of-do-while-loop-p ()
- "Returns non-nil if word after point is `while' of a do-while
-statement, else returns nil. A braceless do-while statement
-spanning several lines requires that the start of the loop is
-indented to the same column as the current line."
- (interactive)
- (save-excursion
- (save-match-data
- (when (looking-at "\\s-*\\<while\\>")
- (if (save-excursion
- (skip-chars-backward "[ \t\n]*}")
- (looking-at "[ \t\n]*}"))
- (save-excursion
- (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
- (js-re-search-backward "\\<do\\>" (point-at-bol) t)
- (or (looking-at "\\<do\\>")
- (let ((saved-indent (current-indentation)))
- (while (and (js-re-search-backward "^[ \t]*\\<" nil t)
- (/= (current-indentation) saved-indent)))
- (and (looking-at "[ \t]*\\<do\\>")
- (not (js-re-search-forward
- "\\<while\\>" (point-at-eol) t))
- (= (current-indentation) saved-indent)))))))))
-
-
-(defun js-ctrl-statement-indentation ()
- "Returns the proper indentation of the current line if it
-starts the body of a control statement without braces, else
-returns nil."
- (save-excursion
- (back-to-indentation)
- (when (save-excursion
- (and (not (looking-at "[{]"))
- (progn
- (js-re-search-backward "[[:graph:]]" nil t)
- (forward-char)
- (when (= (char-before) ?\)) (backward-list))
- (skip-syntax-backward " ")
- (skip-syntax-backward "w")
- (looking-at js-possibly-braceless-keyword-re))
- (not (js-end-of-do-while-loop-p))))
- (save-excursion
- (goto-char (match-beginning 0))
- (+ (current-indentation) javascript-indent-level)))))
-
-
-(defun js-proper-indentation (parse-status)
- "Return the proper indentation for the current line."
- (save-excursion
- (back-to-indentation)
- (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
- (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
- (continued-expr-p (js-continued-expression-p)))
- (cond (ctrl-stmt-indent)
- ((js-continued-var-decl-list-p)
- (js-re-search-backward "\\<var\\>" nil t)
- (+ (current-indentation) javascript-indent-level))
- ((nth 1 parse-status)
- (goto-char (nth 1 parse-status))
- (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
- (progn
- (skip-syntax-backward " ")
- (when (= (char-before) ?\)) (backward-list))
- (back-to-indentation)
- (cond (same-indent-p
- (current-column))
- (continued-expr-p
- (+ (current-column) (* 2 javascript-indent-level)))
- (t
- (+ (current-column) javascript-indent-level))))
- (unless same-indent-p
- (forward-char)
- (skip-chars-forward " \t"))
- (current-column)))
- (continued-expr-p javascript-indent-level)
- (t 0)))))
-
-
-(defun javascript-indent-line ()
- "Indent the current line as JavaScript source text."
- (interactive)
- (let ((parse-status
- (save-excursion (parse-partial-sexp (point-min) (point-at-bol))))
- (offset (- (current-column) (current-indentation))))
- (when (not (nth 8 parse-status))
- (indent-line-to (js-proper-indentation parse-status))
- (when (> offset 0) (forward-char offset)))))
-
-
-;; --- Filling ---
-
-;; FIXME: It should be possible to use the more sofisticated function
-;; `c-fill-paragraph' in `cc-cmds.el' instead. However, just setting
-;; `fill-paragraph-function' to `c-fill-paragraph' does not work;
-;; inside `c-fill-paragraph', `fill-paragraph-function' evaluates to
-;; nil!?
-
-(defun js-backward-paragraph ()
- "Move backward to start of paragraph. Postcondition: Point is at
-beginning of buffer or the previous line contains only whitespace."
- (forward-line -1)
- (while (not (or (bobp) (looking-at "^[ \t]*$")))
- (forward-line -1))
- (when (not (bobp)) (forward-line 1)))
-
-
-(defun js-forward-paragraph ()
- "Move forward to end of paragraph. Postcondition: Point is at
-end of buffer or the next line contains only whitespace."
- (forward-line 1)
- (while (not (or (eobp) (looking-at "^[ \t]*$")))
- (forward-line 1))
- (when (not (eobp)) (backward-char 1)))
-
-
-(defun js-fill-block-comment-paragraph (parse-status justify)
- "Fill current paragraph as a block comment. PARSE-STATUS is the
-result of `parse-partial-regexp' from beginning of buffer to
-point. JUSTIFY has the same meaning as in `fill-paragraph'."
- (let ((offset (save-excursion
- (goto-char (nth 8 parse-status)) (current-indentation))))
- (save-excursion
- (save-restriction
- (narrow-to-region (save-excursion
- (goto-char (nth 8 parse-status)) (point-at-bol))
- (save-excursion
- (goto-char (nth 8 parse-status))
- (re-search-forward "*/")))
- (narrow-to-region (save-excursion
- (js-backward-paragraph)
- (when (looking-at "^[ \t]*$") (forward-line 1))
- (point))
- (save-excursion
- (js-forward-paragraph)
- (when (looking-at "^[ \t]*$") (backward-char))
- (point)))
- (goto-char (point-min))
- (while (not (eobp))
- (delete-horizontal-space)
- (forward-line 1))
- (let ((fill-column (- fill-column offset))
- (fill-paragraph-function nil))
- (fill-paragraph justify))
-
- ;; In Emacs 21.4 as opposed to CVS Emacs 22,
- ;; `fill-paragraph' seems toadd a newline at the end of the
- ;; paragraph. Remove it!
- (goto-char (point-max))
- (when (looking-at "^$") (backward-delete-char 1))
-
- (goto-char (point-min))
- (while (not (eobp))
- (indent-to offset)
- (forward-line 1))))))
-
-
-(defun js-sline-comment-par-start ()
- "Return point at the beginning of the line where the current
-single-line comment paragraph starts."
- (save-excursion
- (beginning-of-line)
- (while (and (not (bobp))
- (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
- (forward-line -1))
- (unless (bobp) (forward-line 1))
- (point)))
-
-
-(defun js-sline-comment-par-end ()
- "Return point at end of current single-line comment paragraph."
- (save-excursion
- (beginning-of-line)
- (while (and (not (eobp))
- (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
- (forward-line 1))
- (unless (bobp) (backward-char))
- (point)))
-
-
-(defun js-sline-comment-offset (line)
- "Return the column at the start of the current single-line
-comment paragraph."
- (save-excursion
- (goto-line line)
- (re-search-forward "//" (point-at-eol))
- (goto-char (match-beginning 0))
- (current-column)))
-
-
-(defun js-sline-comment-text-offset (line)
- "Return the column at the start of the text of the current
-single-line comment paragraph."
- (save-excursion
- (goto-line line)
- (re-search-forward "//[ \t]*" (point-at-eol))
- (current-column)))
-
-
-(defun js-at-empty-sline-comment-p ()
- "Return non-nil if inside an empty single-line comment."
- (and (save-excursion
- (beginning-of-line)
- (not (looking-at "^.*//.*[[:graph:]]")))
- (save-excursion
- (re-search-backward "//" (point-at-bol) t))))
-
-
-(defun js-fill-sline-comments (parse-status justify)
- "Fill current paragraph as a sequence of single-line comments.
-PARSE-STATUS is the result of `parse-partial-regexp' from
-beginning of buffer to point. JUSTIFY has the same meaning as in
-`fill-paragraph'."
- (when (not (js-at-empty-sline-comment-p))
- (let* ((start (js-sline-comment-par-start))
- (start-line (1+ (count-lines (point-min) start)))
- (end (js-sline-comment-par-end))
- (offset (js-sline-comment-offset start-line))
- (text-offset (js-sline-comment-text-offset start-line)))
- (save-excursion
- (save-restriction
- (narrow-to-region start end)
- (goto-char (point-min))
- (while (re-search-forward "^[ \t]*//[ \t]*" nil t)
- (replace-match "")
- (forward-line 1))
- (let ((fill-paragraph-function nil)
- (fill-column (- fill-column text-offset)))
- (fill-paragraph justify))
-
- ;; In Emacs 21.4 as opposed to CVS Emacs 22,
- ;; `fill-paragraph' seems toadd a newline at the end of the
- ;; paragraph. Remove it!
- (goto-char (point-max))
- (when (looking-at "^$") (backward-delete-char 1))
-
- (goto-char (point-min))
- (while (not (eobp))
- (indent-to offset)
- (insert "//")
- (indent-to text-offset)
- (forward-line 1)))))))
-
-
-(defun js-trailing-comment-p (parse-status)
- "Return non-nil if inside a trailing comment. PARSE-STATUS is
-the result of `parse-partial-regexp' from beginning of buffer to
-point."
- (save-excursion
- (when (nth 4 parse-status)
- (goto-char (nth 8 parse-status))
- (skip-chars-backward " \t")
- (not (bolp)))))
-
-
-(defun js-block-comment-p (parse-status)
- "Return non-nil if inside a block comment. PARSE-STATUS is the
-result of `parse-partial-regexp' from beginning of buffer to
-point."
- (save-excursion
- (save-match-data
- (when (nth 4 parse-status)
- (goto-char (nth 8 parse-status))
- (looking-at "/\\*")))))
-
-
-(defun javascript-fill-paragraph (&optional justify)
- "If inside a comment, fill the current comment paragraph.
-Trailing comments are ignored."
- (interactive)
- (let ((parse-status (parse-partial-sexp (point-min) (point))))
- (when (and (nth 4 parse-status)
- (not (js-trailing-comment-p parse-status)))
- (if (js-block-comment-p parse-status)
- (js-fill-block-comment-paragraph parse-status justify)
- (js-fill-sline-comments parse-status justify))))
- t)
-
-
-;; --- Imenu ---
-
-(defconst js-imenu-generic-expression
- (list
- (list
- nil
- "function\\s-+\\(\\w+\\)\\s-*("
- 1))
- "Regular expression matching top level procedures. Used by imenu.")
-
-
-;; --- Main Function ---
-
-;;;###autoload
-(defun javascript-mode ()
- "Major mode for editing JavaScript source text.
-
-Key bindings:
-
-\\{javascript-mode-map}"
- (interactive)
- (kill-all-local-variables)
-
- (use-local-map javascript-mode-map)
- (set-syntax-table javascript-mode-syntax-table)
- (set (make-local-variable 'indent-line-function) 'javascript-indent-line)
- (set (make-local-variable 'font-lock-defaults) (list js-font-lock-keywords))
-
- (set (make-local-variable 'parse-sexp-ignore-comments) t)
-
- ;; Comments
- (setq comment-start "// ")
- (setq comment-end "")
- (set (make-local-variable 'fill-paragraph-function)
- 'javascript-fill-paragraph)
-
- ;; Make c-mark-function work
- (setq c-nonsymbol-token-regexp "!=\\|%=\\|&[&=]\\|\\*[/=]\\|\\+[+=]\\|-[=-]\\|/[*/=]\\|<\\(?:<=\\|[<=]\\)\\|==\\|>\\(?:>\\(?:>=\\|[=>]\\)\\|[=>]\\)\\|\\^=\\||[=|]\\|[]!%&(-,./:-?[{-~^-]"
- c-stmt-delim-chars "^;{}?:"
- c-syntactic-ws-end "[ \n \f/]"
- c-syntactic-eol "\\(\\s \\|/\\*\\([^*\n ]\\|\\*[^/\n ]\\)*\\*/\\)*\\(\\(/\\*\\([^*\n ]\\|\\*[^/\n ]\\)*\\|\\\\\\)?$\\|//\\)")
-
- ;; Imenu
- (setq imenu-case-fold-search nil)
- (set (make-local-variable 'imenu-generic-expression)
- js-imenu-generic-expression)
-
- (setq major-mode 'javascript-mode)
- (setq mode-name "JavaScript")
- (run-hooks 'javascript-mode-hook))
-
-
-(provide 'javascript-mode)
-;;; javascript.el ends here
diff --git a/emacs.d/elisp/stumpwm-mode.el b/emacs.d/elisp/stumpwm-mode.el
new file mode 100644
index 0000000..0d5fa13
--- /dev/null
+++ b/emacs.d/elisp/stumpwm-mode.el
@@ -0,0 +1,68 @@
+;;; stumpwm-mode.el --- special lisp mode for evaluating code into running stumpwm
+
+;; Copyright (C) 2007 Shawn Betts
+
+;; Maintainer: Shawn Betts
+;; Keywords: comm, lisp, tools
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; load this file, set stumpwm-shell-program to point to stumpish and
+;; run M-x stumpwm-mode in your stumpwm lisp files. Now, you can
+;; easily eval code into a running stumpwm using the regular bindings.
+
+;;; Code:
+
+(defvar stumpwm-shell-program "stumpish"
+ "program name, including path if needed, for the stumpish program.")
+
+(define-minor-mode stumpwm-mode
+ "add some bindings to eval code into a running stumpwm using stumpish."
+ :global nil
+ :lighter " StumpWM"
+ :keymap (let ((m (make-sparse-keymap)))
+ (define-key m (kbd "C-M-x") 'stumpwm-eval-defun)
+ (define-key m (kbd "C-x C-e") 'stumpwm-eval-last-sexp)
+ m))
+
+(defun stumpwm-eval-region (start end)
+ (interactive "r")
+ (let ((s (buffer-substring-no-properties start end)))
+ (message "%s"
+ (with-temp-buffer
+ (call-process stumpwm-shell-program nil (current-buffer) nil
+ "eval"
+ s)
+ (delete-char -1)
+ (buffer-string)))))
+
+(defun stumpwm-eval-defun ()
+ (interactive)
+ (save-excursion
+ (end-of-defun)
+ (skip-chars-backward " \t\n\r\f")
+ (let ((end (point)))
+ (beginning-of-defun)
+ (stumpwm-eval-region (point) end))))
+
+(defun stumpwm-eval-last-sexp ()
+ (interactive)
+ (stumpwm-eval-region (save-excursion (backward-sexp) (point)) (point)))
+
+(provide 'stumpwm-mode)
+;;; stumpwm-mode.el ends here
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-01 13:48:44 +0000