Commits

Stephen Weeks committed bd13061

cleanup while working on roll

Comments (0)

Files changed (10)

doc/omake-mode.texi

 @node Keybindings
 @unnumbered Keybindings
 @itemize
-@item @kbd{C-c C-c} @kbd{Omake.start-project}
+@item @kbd{C-c C-c} @kbd{Omake.compile}
 @item @kbd{C-c C-d} @kbd{Omake.set-dedicated-error-window}
 @item @kbd{C-c C-h} @kbd{Omake.toggle-expanded-error}
 @item @kbd{C-c C-l} @kbd{Omake.next-error}

elisp/jane/README

 
 Emacs support for the code review tool (cr)
 
+** jane-deprecated.el
+Functions that have been deprecated, along with pointers to the replacement.
 ** jane-defaults.el
 
 Sane default settings for most emacs users

elisp/jane/jane-deprecated.el

+(dolist (names
+         '(
+           (Jane.omake-js                    Jane.omake-jane)
+           (Js.underscore-is-punctuation     Jane.underscore-is-punctuation)
+           (Js.underscore-is-word            Jane.underscore-is-word)
+           (Omake.clear-dedicated-windows    Omake.clear-dedicated-windows-and-frames)
+           (Omake.compile                    Omake.start-project)
+           (Omake.notify-maintainer-of-error nothing)
+           (Omake.set-dedicated-error-frame  Omake.set-dedicated-status-frame)
+           (Omake.set-dedicated-error-window Omake.set-dedicated-status-window)
+           (Omake.show-error-buffer          Omake.show-status-buffer)
+           (Omake.show-project-log-buffer    nothing)
+           ))
+  (let* ((old-name (car names))
+         (new-name (cadr names))
+         (message (concat (symbol-name old-name)
+                          " has been superseded by "
+                          (symbol-name new-name))))
+    (fset old-name `(lambda (&rest args) ,message (warn ,message)))))
+
+
+
+
+
+

elisp/jane/jane-ocaml.el

 
 ;; CR cfalls: Make these properly named (Jane.<foo>) and documented micro-features.
 
-(defun Js.underscore-is-word ()
+(defun Jane.underscore-is-word ()
   (interactive)
   (modify-syntax-entry ?_ "w" jane-tuareg-navigation-syntax-table))
 
-(defun Js.underscore-is-punctuation ()
+(defun Jane.underscore-is-punctuation ()
   (interactive)
   (modify-syntax-entry ?_ "." jane-tuareg-navigation-syntax-table))
 
-(defun Js.tuareg-indent-line-with-syntax (&optional from-leading-star)
+(defun Jane.tuareg-indent-line-with-syntax (&optional from-leading-star)
   (interactive)
   (with-syntax-table jane-tuareg-indent-syntax-table
     (tuareg-indent-command from-leading-star)))
   (set (make-local-variable 'compile-command) jane-make-command)
   (setq whitespace-style '(lines-tail tabs tab-mark trailing))
   (add-hook 'before-save-hook 'whitespace-cleanup)
-  (setq indent-line-function 'Js.tuareg-indent-line-with-syntax)
+  (setq indent-line-function 'Jane.tuareg-indent-line-with-syntax)
   (let ((mycaml (expand-file-name "mycaml" default-directory)))
     (when (file-exists-p mycaml)
       (set (make-local-variable 'tuareg-interactive-program) mycaml))))

elisp/omake/notes/MULTI

 
 
-* Omake.start-project
+* Omake.compile
   run this in a directory to compile a project.  If there is already a
   project compiling, watch it.
 

elisp/omake/omake-custom.el

 ;; (setq Omake.show-status-buffer-in-top-or-left-window nil)
 
 (defcustom Omake.create-dedicated-status-frame nil
-  "Omake.start-project (C-c C-c) will create a dedicated status frame"
+  "Omake.compile (C-c C-c) will create a dedicated status frame"
   :group 'omake
   :type 'boolean)
 ;; (setq Omake.create-dedicated-status-frame t)

elisp/omake/omake-interface.el

 ;; Starting and watching projects                                             ;;
 ;;----------------------------------------------------------------------------;;
 
-(defalias 'Omake.compile 'Omake.start-project)
-
 ;; Postcondition: a project for the current directory exists
 ;; and is being watched, unless the user cancels the opeation.
-(defun Omake.start-project (&optional read-command)
+(defun Omake.compile (&optional read-command)
   "Create a project from the current directory."
   (interactive "P")
   (Omake.handle-errors

elisp/omake/omake-project.el

 (dolist (bind
          '(("0" . (lambda () (interactive) (Omake.Project.goto-line 0)))
            ("1" . (lambda () (interactive) (Omake.Project.goto-line 1)))
+           ;; CR sweeks: cut and paste error -- generate the list programmatically?
            ("2" . (lambda () (interactive) (Omake.Project.goto-line 1)))
            ("3" . (lambda () (interactive) (Omake.Project.goto-line 1)))
            ("4" . (lambda () (interactive) (Omake.Project.goto-line 1)))

elisp/omake/omake-setup.el

 (defconst Omake.keymap (make-sparse-keymap))
 
 (dolist (bind
-         '(("\C-c\C-c" . Omake.start-project)
+         '(("\C-c\C-c" . Omake.compile)
            ("\C-c\C-g" . Omake.toggle-env)
            ("\C-c\C-l" . Omake.next-error)
            ("\C-c\C-h" . Omake.toggle-expanded-error)
 
 Quick reference:
 
-  C-c C-c . Omake.start-project
+  C-c C-c . Omake.compile
      Start (or watch) compilation in the current directory
 
   C-c C-l . Omake.next-error

elisp/omake/omake-window.el

                    (split-window-horizontally)
                  (split-window-vertically)))
         (left (selected-window)))
+    (if (boundp 'Omake.show-error-buffer-in-top-or-left-window)
+        (warn "\
+Omake.show-error-buffer-in-top-or-left-window has been superseded by
+Omake.show-status-buffer-in-top-or-left-window."))
     (if Omake.show-status-buffer-in-top-or-left-window
         (cons right left)
       (cons left right))))