(x-gtk-map-stock): Delete duplicated definitions from merge.
* progmodes/octave-mod.el: Require octave-inf at compile time
* progmodes/compile.el (compilation-skip-to-next-location)
(compilation-skip-threshold, compilation-skip-visited): Move
definitions earlier.
* play/zone.el (zone-fall-through-ws):
* play/landmark.el (lm-move-down, lm-move-up):
* play/handwrite.el (handwrite):
* mail/mspools.el (mspools-visit-spool):
* wdired.el (wdired-next-line, wdired-previous-line):
* tar-mode.el (tar-subfile-save-buffer):
* scroll-lock.el (scroll-lock-next-line)
(scroll-lock-previous-line):
* image-dired.el (image-dired-next-line)
(image-dired-previous-line):
* ediff-help.el (ediff-help-message-line-length): Use
forward-line.
* smerge-mode.el (smerge-auto-refine):
* diff-mode.el (diff-auto-refine): Add :group.
* play/yow.el: Require doctor at compile time.
* vmsproc.el: Provide vmsproc.
(command-send-input): Use forward-line.
* vms-patch.el: Require ps-print and vmsproc at compile time.
* vc-mtn.el (log-view-message-re, log-view-file-re)
(log-view-font-lock-keywords): Pacify byte-compiler.
* vc-hg.el: Require log-view at compile time.
+2007-10-20 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * term/x-win.el (x-gtk-stock-map, icon-map-list)
+ (x-gtk-map-stock): Delete duplicated definitions from merge.
+
+ * progmodes/octave-mod.el: Require octave-inf at compile time
+
+ * progmodes/compile.el (compilation-skip-to-next-location)
+ (compilation-skip-threshold, compilation-skip-visited): Move
+ definitions earlier.
+
+ * play/zone.el (zone-fall-through-ws):
+ * play/landmark.el (lm-move-down, lm-move-up):
+ * play/handwrite.el (handwrite):
+ * mail/mspools.el (mspools-visit-spool):
+ * wdired.el (wdired-next-line, wdired-previous-line):
+ * tar-mode.el (tar-subfile-save-buffer):
+ * scroll-lock.el (scroll-lock-next-line)
+ (scroll-lock-previous-line):
+ * image-dired.el (image-dired-next-line)
+ (image-dired-previous-line):
+ * ediff-help.el (ediff-help-message-line-length): Use
+ forward-line.
+
+ * smerge-mode.el (smerge-auto-refine):
+ * diff-mode.el (diff-auto-refine): Add :group.
+
+ * play/yow.el: Require doctor at compile time.
+
+ * vmsproc.el: Provide vmsproc.
+ (command-send-input): Use forward-line.
+
+ * vms-patch.el: Require ps-print and vmsproc at compile time.
+
+ * vc-mtn.el (log-view-message-re, log-view-file-re)
+ (log-view-font-lock-keywords): Pacify byte-compiler.
+
+ * vc-hg.el: Require log-view at compile time.
+
2007-10-20 Eric S. Raymond <esr@snark.thyrsus.com>
* log-view.el (log-view-diff): Adapt log-view-diff for new VC API.
(defcustom diff-auto-refine t
"Automatically highlight changes in detail as the user visits hunks."
- :type 'boolean)
+ :type 'boolean
+ :group 'diff-mode)
(defcustom diff-mode-hook nil
"Run after setting up the `diff-mode' major mode."
(save-excursion
(goto-char (point-min))
(if ediff-use-long-help-message
- (next-line 1))
+ (forward-line 1))
(end-of-line)
(current-column)))
(defun image-dired-next-line ()
"Move to next line and display properties."
(interactive)
- (next-line 1)
+ (forward-line 1)
;; If we end up in an empty spot, back up to the next thumbnail.
(if (not (image-dired-image-at-point-p))
(image-dired-backward-image))
(defun image-dired-previous-line ()
"Move to previous line and display properties."
(interactive)
- (previous-line 1)
+ (forward-line -1)
;; If we end up in an empty spot, back up to the next
;; thumbnail. This should only happen if the user deleted a
;; thumbnail and did not refresh, so it is not very common. But we
(end-of-line)
(point)))
mspools-files-len)
- (next-line (- 1 mspools-files-len)) ;back to top of list
+ (forward-line (- 1 mspools-files-len)) ;back to top of list
;; else just on to next line
- (next-line 1))
+ (forward-line 1))
;; Choose whether to use VM or RMAIL for reading folder.
(if mspools-using-vm
(forward-line 1)
))
(switch-to-buffer ps-buf-name)
- (next-line 1)
+ (forward-line 1)
(insert "showpage exec Hwsave restore\n\n")
(insert "%%Pages " (number-to-string ipage) " 0\n")
(insert "%%EOF\n")
"Move point down one row on the Lm board."
(interactive)
(if (< (lm-point-y) lm-board-height)
- (next-line 1)));;; lm-square-height)))
+ (forward-line 1)));;; lm-square-height)))
(defun lm-move-up ()
"Move point up one row on the Lm board."
(interactive)
(if (> (lm-point-y) 1)
- (previous-line lm-square-height)))
+ (forward-line (- lm-square-height))))
(defun lm-move-ne ()
"Move point North East on the Lm board."
;;; Code:
(require 'cookie1)
+(eval-when-compile (require 'doctor))
(defgroup yow nil
"Quote random zippyisms."
(wait 0.15)
newpos fall-p)
(while (when (save-excursion
- (next-line 1)
+ (forward-line 1)
(and (= col (current-column))
(setq newpos (point))
(string= spaces (buffer-substring-no-properties
"If non-nil, automatically jump to the next error encountered.")
(make-variable-buffer-local 'compilation-auto-jump-to-next)
+
+(defvar compilation-skip-to-next-location t
+ "*If non-nil, skip multiple error messages for the same source location.")
+
+(defcustom compilation-skip-threshold 1
+ "Compilation motion commands skip less important messages.
+The value can be either 2 -- skip anything less than error, 1 --
+skip anything less than warning or 0 -- don't skip any messages.
+Note that all messages not positively identified as warning or
+info, are considered errors."
+ :type '(choice (const :tag "Warnings and info" 2)
+ (const :tag "Info" 1)
+ (const :tag "None" 0))
+ :group 'compilation
+ :version "22.1")
+
+(defcustom compilation-skip-visited nil
+ "Compilation motion commands skip visited messages if this is t.
+Visited messages are ones for which the file, line and column have been jumped
+to from the current content in the current compilation buffer, even if it was
+from a different message."
+ :type 'boolean
+ :group 'compilation
+ :version "22.1")
+
(defun compilation-face (type)
(or (and (car type) (match-end (car type)) compilation-warning-face)
(and (cdr type) (match-end (cdr type)) compilation-info-face)
(put 'compilation-mode 'mode-class 'special)
-(defvar compilation-skip-to-next-location t
- "*If non-nil, skip multiple error messages for the same source location.")
-
-(defcustom compilation-skip-threshold 1
- "Compilation motion commands skip less important messages.
-The value can be either 2 -- skip anything less than error, 1 --
-skip anything less than warning or 0 -- don't skip any messages.
-Note that all messages not positively identified as warning or
-info, are considered errors."
- :type '(choice (const :tag "Warnings and info" 2)
- (const :tag "Info" 1)
- (const :tag "None" 0))
- :group 'compilation
- :version "22.1")
-
-(defcustom compilation-skip-visited nil
- "Compilation motion commands skip visited messages if this is t.
-Visited messages are ones for which the file, line and column have been jumped
-to from the current content in the current compilation buffer, even if it was
-from a different message."
- :type 'boolean
- :group 'compilation
- :version "22.1")
-
;;;###autoload
(defun compilation-mode (&optional name-of-mode)
"Major mode for compilation log buffers.
(or arg (setq arg 1))
(scroll-lock-update-goal-column)
(if (pos-visible-in-window-p (point-max))
- (next-line arg)
+ (forward-line arg)
(scroll-up arg))
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
(scroll-lock-update-goal-column)
(condition-case nil
(scroll-down arg)
- (beginning-of-buffer (previous-line arg)))
+ (beginning-of-buffer (forward-line (- arg))))
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
(defun scroll-lock-forward-paragraph (&optional arg)
(defcustom smerge-auto-refine t
"Automatically highlight changes in detail as the user visits conflicts."
+ :group 'smerge
:type 'boolean)
(defface smerge-mine
;;
(let ((position (- (length tar-parse-info) (length head))))
(goto-char (point-min))
- (next-line position)
+ (forward-line position)
(beginning-of-line)
(let ((p (point))
after
(provide 'x-win)
-(defcustom x-gtk-stock-map
- '(
- ("etc/images/new" . "gtk-new")
- ("etc/images/open" . "gtk-open")
- ("etc/images/diropen" . "n:system-file-manager")
- ("etc/images/close" . "gtk-close")
- ("etc/images/save" . "gtk-save")
- ("etc/images/saveas" . "gtk-save-as")
- ("etc/images/undo" . "gtk-undo")
- ("etc/images/cut" . "gtk-cut")
- ("etc/images/copy" . "gtk-copy")
- ("etc/images/paste" . "gtk-paste")
- ("etc/images/search" . "gtk-find")
- ("etc/images/print" . "gtk-print")
- ("etc/images/preferences" . "gtk-preferences")
- ("etc/images/help" . "gtk-help")
- ("etc/images/left-arrow" . "gtk-go-back")
- ("etc/images/right-arrow" . "gtk-go-forward")
- ("etc/images/home" . "gtk-home")
- ("etc/images/jump-to" . "gtk-jump-to")
- ("etc/images/index" . "gtk-index")
- ("etc/images/search" . "gtk-find")
- ("etc/images/exit" . "gtk-quit"))
- "How icons for tool bars are mapped to Gtk+ stock items.
-Emacs must be compiled with the Gtk+ toolkit for this to have any effect.
-A value that begins with n: denotes a named icon instead of a stock icon."
- :version "22.2"
- :type 'alist
- :group 'x)
-
-(defvar icon-map-list nil
- "*A list of alists that maps icon file names to stock/named icons.
-The alists are searched in the order they appear. The first match is used.
-The keys in the alists are file names without extension and with two directory
-components. For example, to map /usr/share/emacs/22.1.1/etc/images/open.xpm
-to stock item gtk-open, use:
-
- (\"etc/images/open\" . \"gtk-open\")
-
-Themes also have named icons. To map to one of those, use n: before the name:
-
- (\"etc/images/diropen\" . \"n:system-file-manager\")
-
-The list elements are either the symbol name for the alist or the alist itself.")
-
-(defun x-gtk-map-stock (file)
- "Map icon with file name FILE to a Gtk+ stock name, using `x-gtk-stock-map'."
- (let* ((file-sans (file-name-sans-extension file))
- (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans)
- (match-string 1 file-sans)))
- (value))
- (mapc (lambda (elem)
- (let ((assoc (if (symbolp elem) (symbol-value elem) elem)))
- (or value (setq value (assoc-string (or key file-sans) assoc)))))
- icon-map-list)
- (and value (cdr value))))
-
;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
;;; x-win.el ends here
(vc-hg-incoming-mode)))
;; XXX maybe also add key bindings for these functions.
+(eval-when-compile (require 'log-view))
(defun vc-hg-push ()
(interactive)
(let ((marked-list (log-view-get-marked)))
(defun vc-mtn-print-log (files &optional buffer)
(vc-mtn-command buffer 0 files "log"))
+(defvar log-view-message-re)
+(defvar log-view-file-re)
+(defvar log-view-font-lock-keywords)
+
(define-derived-mode vc-mtn-log-view-mode log-view-mode "Mtn-Log-View"
;; TODO: Not sure what to do about file markers for now.
(set (make-local-variable 'log-view-file-re) "\\'\\`")
;;; Code:
+(eval-when-compile
+ (require 'ps-print)
+ (require 'vmsproc))
+
(setq auto-mode-alist (cons '(("\\.com\\'" . dcl-mode)) auto-mode-alist))
;;; Functions that need redefinition
(send-command-to-subprocess 1 current-line)
(if command-prefix-string
(progn (beginning-of-line) (insert command-prefix-string)))
- (next-line 1))))
+ (forward-line 1))))
;; else -- if not at last line in buffer
(goto-char (point-max))
(backward-char)
- (next-line 1)
+ (forward-line 1)
(insert
(if (compare-strings command-prefix-string nil nil
current-line 0 (length command-prefix-string))
(define-key esc-map "$" 'subprocess-command)
+(provide 'vmsproc)
+
;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66
;;; vmsproc.el ends here
See `wdired-use-dired-vertical-movement'. Optional prefix ARG
says how many lines to move; default is one line."
(interactive "p")
- (next-line arg)
+ (forward-line arg)
(if (or (eq wdired-use-dired-vertical-movement t)
(and wdired-use-dired-vertical-movement
(< (current-column)
See `wdired-use-dired-vertical-movement'. Optional prefix ARG
says how many lines to move; default is one line."
(interactive "p")
- (previous-line arg)
+ (forward-line (- arg))
(if (or (eq wdired-use-dired-vertical-movement t)
(and wdired-use-dired-vertical-movement
(< (current-column)
projects / emacs.git / commitdiff