merging

Author: adben

CheatSheets/VC-mode.org.txt.BACKUP.1323.txt

@@ -0,0 +1,24 @@
+VC mode cheatsheet:
+
+On current file:
+* View diff between revisions:
+** C-x v =
+** C-u C-x v =
+* View commit log:
+** C-x v l
+** Inside this buffer:
+*** "f" to visit the revision at point
+*** "d" to visit a diff of revision at point
+* Add current file to commit
+** C-x v i
+* Commit current file
+** C-x v v
+* Discard changes:
+** C-x v u
+* Modeline:
+** Git:
+*** The modeline shows the current branch
+*** "git-master" show the file is unchanged from the committed version
+*** "git:master" shows the file has been changed from the committed version
+
+

CheatSheets/VC-mode.org.txt.LOCAL.1323.txt

@@ -0,0 +1,24 @@
+VC mode cheatsheet:
+
+On current file:
+* View diff between revisions:
+** C-x v =
+** C-u C-x v =
+* View commit log:
+** C-x v l
+** Inside this buffer:
+*** "f" to visit the revision at point
+*** "d" to visit a diff of revision at point
+* Add current file to commit
+** C-x v i
+* Commit current file
+** C-x v v
+* Discard changes:
+** C-x v u
+* Modeline:
+** Git:
+*** The modeline shows the current branch
+*** "git-master" show the file is unchanged from the committed version
+*** "git:master" shows the file has been changed from the committed version
+
+

CheatSheets/VC-mode.org.txt.REMOTE.1323.txt

@@ -0,0 +1,24 @@
+VC mode cheatsheet:
+
+On current file:
+* View diff between revisions:
+** C-x v =
+** C-u C-x v =
+* View commit log:
+** C-x v l
+** Inside this buffer:
+*** "f" to visit the revision at point
+*** "d" to visit a diff of revision at point
+* Add current file to commit
+** C-x v i
+* Commit current file
+** C-x v v
+* Discard changes:
+** C-x v u
+* Modeline:
+** Git:
+*** The modeline shows the current branch
+*** "git-master" show the file is unchanged from the committed version
+*** "git:master" shows the file has been changed from the committed version
+
+

abbrev_defs

@@ -3,6 +3,7 @@
 
 (define-abbrev-table 'Custom-mode-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'awk-mode-abbrev-table
   '(
    ))
@@ -16,21 +17,38 @@
 (define-abbrev-table 'c-mode-abbrev-table
   '(
    ))
+=======
+(define-abbrev-table 'apropos-mode-abbrev-table '())
+
+(define-abbrev-table 'calendar-mode-abbrev-table '())
+>>>>>>> emacs24
 
 (define-abbrev-table 'change-log-mode-abbrev-table '())
 
 (define-abbrev-table 'comint-mode-abbrev-table '())
 
 (define-abbrev-table 'completion-list-mode-abbrev-table '())
 
+<<<<<<< HEAD
+(define-abbrev-table 'diff-mode-abbrev-table '())
+
+=======
+(define-abbrev-table 'confluence-mode-abbrev-table '())
+
+(define-abbrev-table 'confluence-search-mode-abbrev-table '())
+
 (define-abbrev-table 'diff-mode-abbrev-table '())
 
+(define-abbrev-table 'emacs-lisp-mode-abbrev-table '())
+
+>>>>>>> emacs24
 (define-abbrev-table 'erc-mode-abbrev-table '())
 
 (define-abbrev-table 'fundamental-mode-abbrev-table '())
 
 (define-abbrev-table 'global-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'idl-mode-abbrev-table '())
 
 (define-abbrev-table 'inferior-python-mode-abbrev-table '())
@@ -54,6 +72,13 @@
 (define-abbrev-table 'jde-run-mode-abbrev-table '())
 
 (define-abbrev-table 'jython-mode-abbrev-table '())
+=======
+(define-abbrev-table 'grep-mode-abbrev-table '())
+
+(define-abbrev-table 'html-mode-abbrev-table '())
+
+(define-abbrev-table 'inferior-moz-mode-abbrev-table '())
+>>>>>>> emacs24
 
 (define-abbrev-table 'ledger-mode-abbrev-table '())
 
@@ -74,6 +99,7 @@
 
 (define-abbrev-table 'magit-log-edit-mode-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'objc-mode-abbrev-table
   '(
    ))
@@ -85,10 +111,36 @@
 (define-abbrev-table 'python-mode-abbrev-table '())
 
 (define-abbrev-table 'select-tags-table-mode-abbrev-table '())
+=======
+(define-abbrev-table 'magit-show-branches-mode-abbrev-table '())
+
+(define-abbrev-table 'noshell-process-mode-abbrev-table '())
+
+(define-abbrev-table 'nxhtml-mode-abbrev-table '())
+
+(define-abbrev-table 'org-mode-abbrev-table '())
+
+(define-abbrev-table 'outline-mode-abbrev-table '())
+
+(define-abbrev-table 'prog-mode-abbrev-table '())
+
+(define-abbrev-table 'sgml-mode-abbrev-table '())
+
+(define-abbrev-table 'snippet-mode-abbrev-table '())
+>>>>>>> emacs24
 
 (define-abbrev-table 'special-mode-abbrev-table '())
 
 (define-abbrev-table 'text-mode-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())
 
+=======
+(define-abbrev-table 'udev-control-mode-abbrev-table '())
+
+(define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())
+
+(define-abbrev-table 'wab-compilation-mode-abbrev-table '())
+
+>>>>>>> emacs24

ac-comphist.dat

@@ -0,0 +1 @@
+(nil)

adben-OSX.el

@@ -1,4 +1,70 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Mac OSX customizations
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(normal-erase-is-backspace-mode t)
+<<<<<<< HEAD
+(normal-erase-is-backspace-mode t)
+=======
+(normal-erase-is-backspace-mode t)
+(require 'mac-key-mode)
+;; The default keymaps are as follows:
+;;     ⌘ + O — Open an existing file into an Emacs buffer
+;;     ⌘ + W — Discard (kill) current buffer
+;;     ⌘ + S — Save current buffer into its file
+;;     ⌘ + ⇧ (Shift) + S — Write current buffer into another file
+;;     ⌘ + I — Display current file/directory in a Finder window
+;;     ⌘ + P — Print current buffer
+;;     ⌘ + Q — Quit
+;;     ⌘ + Z — Undo
+;;     ⌘ +⇧ (Shift) + Z — Redo
+;;     ⌘ + X — Cut
+;;     ⌘ + C — Copy
+;;     ⌘ + V — Paste
+;;     ⌘ + A — Select All
+;;     ⌘ + F — Search for a string
+;;     ⌘ + ⌥ (Option) + F — Advanced Search (M-x occur)
+;;     ⌘ + G — Search forward for a string
+;;     ⌘ + ⇧ (Shift) + G — Search backward for a string
+;;     ⌘ + L — Go to Line
+;;     ⌘ + T — Show/Hide the font panel.
+;;     ⌘ + M — Minimize the window
+;;     ⌘ + ` — Move to a different visible window (frame)
+;;     ⌘ + ⇧ (Shift) + N — Make a new window (frame)
+;;     ⌘ + ⇧ (Shift) + W — Close window (frame)
+;;     ⌘ + ? — Show help files (M-x info)
+;;     ⌘ + / — Same as ⌘ + ?
+;;     ⌘ + . — Interrupt operation
+;;     ⌘ + ↑ — Move point to the beginning of the buffer
+;;     ⌘ + ↓ — Move point to the end of the buffer
+;;     ⌘ + ← — Move point to beginning of current line
+;;     ⌘ + → — Move point to end of current line
+;;     ⌘ + Click — Open URL with a browser
+;;     ⌃ (Control) + Click — Show contextual menu
+;;     ⇧ (Shift) + Click — Select region
+;;; MacOS X specific stuff
+; setting Hyper and Super keys for the Mac keyboard, for emacs running in OS X
+(setq mac-option-modifier 'hyper) ; sets the Option key as Hyper
+(setq mac-option-modifier 'super) ; sets the Option key as Super
+;;(setq mac-command-modifier 'meta) ; sets the Command key as Meta
+(setq mac-control-modifier 'meta) ; sets the Control key as Meta
+;;(setq mac-option-modifier 'meta)
+(setq mac-command-modifier 'ctrl) ;sets command key as ctrl
+;;(setq mac-command-modifier 'crtl mac-option-modifier 'meta)
+(define-key mac-key-mode-map [(alt l)] 'goto-line)
+;; (global-set-key [(hyper a)] 'mark-whole-buffer)
+;; (global-set-key [(hyper v)] 'yank)
+;; (global-set-key [(hyper c)] 'kill-ring-save)
+;; (global-set-key [(hyper x)] 'kill-region)
+;; (global-set-key [(hyper s)] 'save-buffer)
+;; (global-set-key [(hyper l)] 'goto-line)
+;; (global-set-key [(hyper o)] 'find-file)
+;; (global-set-key [(hyper f)] 'isearch-forward)
+;; (global-set-key [(hyper g)] 'isearch-repeat-forward)
+;; (global-set-key [(hyper w)]
+;;                 (lambda () (interactive) (kill-buffer (current-buffer))))
+;; (global-set-key [(hyper .)] 'keyboard-quit)
+;; I disabled this since I want to avoid hitting Cmd-q accidentally.
+(global-set-key [(hyper q)] 'save-buffers-kill-emacs)
+(require 'redo+)
+(global-set-key [(hyper z)] 'undo)
+(global-set-key [(hyper shift z)] 'redo)
+>>>>>>> emacs24

adben-cedet.el

@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; CEDET
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+<<<<<<< HEAD
 (load-file "~/.emacs.d/vendor/cedet/common/cedet.el")
 ;;make all the 'semantic.cache' files go somewhere sane
 (setq semanticdb-default-save-directory "~/emacs-meta/semantic.cache/")
@@ -11,3 +12,24 @@
 ;; (semantic-load-enable-excessive-code-helpers)
 ;; Enable this if you develop in semantic, or develop grammars
 ;; (semantic-load-enable-semantic-debugging-helpers)
+=======
+;;(load-file "~/.emacs.d/vendor/cedet/common/cedet.el")
+;;(add-to-list 'load-path "/Applications/Emacs.app/Contents/Resources/lisp/cedet/")
+(load-file "/Applications/Emacs.app/Contents/Resources/lisp/cedet/cedet.elc");;
+;;make all the 'semantic.cache' files go somewhere sane
+;;(require 'semantic)
+(setq semanticdb-default-save-directory "~/.emacs-meta/semantic.cache/")
+;; Enabling various SEMANTIC minor modes.  See semantic/INSTALL for more ideas.
+;; Select one of the following
+;; (semantic-load-enable-code-helpers 1)
+;; (semantic-load-enable-guady-code-helpers 1)
+;; (semantic-load-enable-excessive-code-helpers 1)
+;; ;; ;;Enable this if you develop in semantic, or develop grammars
+;; (semantic-load-enable-semantic-debugging-helpers)
+(require 'cedet)
+(require 'eieio)
+(require 'semantic)
+(require 'speedbar)
+(require 'srecode)
+(require 'ede)
+>>>>>>> emacs24

adben-clojure.el

@@ -0,0 +1,102 @@
+;;
+(load-library "elein")
+
+;; clojure-mode
+(add-to-list 'load-path "~/.emacs.d/elpa/clojure-mode-1.8.0/")
+(require 'clojure-mode)
+
+;; swank-clojure
+;;(add-to-list 'load-path "~/.emacs.d/elpa/swank-clojure-1.1.0/")
+(add-to-list 'load-path "~/git/swank-clojure")
+
+(setq swank-clojure-jar-path "~/.m2/repository/org/clojure/clojure/1.2.0/clojure-1.2.0.jar"
+      swank-clojure-extra-classpaths (list
+                                      ;;				      "~/.emacs.d/elpa/swank-clojure-1.1.0/"
+				      "~/git/swank-clojure"
+				      "~/.m2/repository/org/clojure/clojure-contrib/1.2.0/clojure-contrib-1.2.0.jar"))
+
+(require 'swank-clojure)
+
+;; slime
+(eval-after-load "slime"
+;'(setq slime-protocol-version 'ignore)
+'(progn (slime-setup '(slime-repl))))
+
+;;(add-to-list 'load-path "~/git/slime")
+(add-to-list 'load-path "~/.emacs.d/elpa/slime-20100404.1/")
+(require 'slime)
+(slime-setup) 
+
+;; Autoloads and basic wiring
+(autoload 'clojure-mode "clojure-mode" "Major mode for editing Clojure code." t nil)
+(autoload 'clojure-test-mode "clojure-test-mode" "A minor mode for running Clojure tests." t nil)
+(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
+
+(eval-after-load "clojure-mode"
+  '(progn
+     (require 'clojure-test-mode)))
+(autoload 'swank-clojure-init "swank-clojure" "" nil nil)
+(autoload 'swank-clojure-slime-mode-hook "swank-clojure" "" nil nil)
+(autoload 'swank-clojure-cmd "swank-clojure" "" nil nil)
+(defadvice slime-read-interactive-args (before add-clojure)
+  (require 'assoc)
+  (aput 'slime-lisp-implementations 'clojure (list (swank-clojure-cmd) :init 'swank-clojure-init)))
+(autoload 'swank-clojure-project "swank-clojure" "" t nil)
+(add-hook 'clojure-mode-hook 'clojure-test-maybe-enable)
+(add-hook 'slime-repl-mode-hook 'clojure-mode-font-lock-setup)
+
+
+;; Use technomancy's bag of fancy clojure/slime tricks
+(add-to-list 'load-path "~/git/durendal")
+(require 'durendal)
+(durendal-enable t)
+
+;;(add-hook 'clojure-mode-hook 'enable-paredit-mode) ;; ToDo check hubert's paredit config
+(add-hook 'clojure-mode-hook 'font-lock-mode) ;; because it doesn't turn on in Emacs 24
+
+(defun slime-clojure-repl-setup ()
+  "Some REPL setup additional to that in durendal"
+  (when (string-equal (slime-lisp-implementation-name) "clojure")
+    (when (slime-inferior-process)
+      (message "Setting up repl for clojure")
+      (slime-redirect-inferior-output))
+
+    (set-syntax-table clojure-mode-syntax-table)
+    (setq lisp-indent-function 'clojure-indent-function)))
+
+(add-hook 'slime-repl-mode-hook 'slime-clojure-repl-setup)
+
+
+(defun lein-swank ()
+  (interactive)
+  (let ((default-directory (locate-dominating-file default-directory "project.clj")))
+    (when (not default-directory)
+      (error "Not in a Leiningen project."))
+    ;; you can customize slime-port using .dir-locals.el
+    (let ((proc (start-process "lein-swank" nil "lein" "swank" (number-to-string slime-port))))
+      (when proc
+	(process-put proc :output nil)
+	(set-process-sentinel proc (lambda (proc event)
+				     (message "%s%s: `%S'" 
+					      (process-get proc :output)
+					      proc (replace-regexp-in-string "\n" "" event))))
+	(set-process-filter proc
+			    (lambda (proc output)
+			      ;; record last line of output until connected (possible error message)
+			      (process-put proc :output (concat (process-get proc :output) output))
+			      (when (string-match "Connection opened on" output)
+				(slime-connect "localhost" slime-port)
+				;; no need to further process output
+				(set-process-filter proc nil))))
+	(message "Starting swank server...")))))
+
+
+
+
+(eval-after-load "viper"
+  '(add-to-list 'viper-vi-state-mode-list 'clojure-mode))
+
+(eval-after-load "gist"
+  '(add-to-list 'gist-supported-modes-alist '(clojure-mode . ".clj")))
+
+(provide 'adben-clojure)