# HG changeset patch # User Dan Nicolaescu # Date 1192819269 0 # Node ID e1af3a725ca4bf9b34b20a595d72c419cc99a50d # Parent a3bb0c15528c51144b60763c75e725ce9e60b89b * textmodes/two-column.el (2C-split, 2C-merge): * textmodes/bib-mode.el (bib-find-key, mark-bib): * progmodes/idlw-shell.el (idlwave-shell-move-or-history): * progmodes/etags.el (find-tag-in-order, etags-tags-apropos) * progmodes/ada-xref.el (ada-get-all-references): * obsolete/mlsupport.el (ml-next-line, ml-previous-line): * emulation/vi.el (vi-previous-line-first-nonwhite) (vi-effective-range, vi-put-before): * emulation/edt.el (edt-next-line, edt-previous-line) (edt-paragraph-forward): Use forward-line. * progmodes/etags.el (tags-apropos): Require apropos at compile time too. * progmodes/prolog.el: Require comint when compiling. (inferior-prolog-flavor): Move defvar before use. diff -r a3bb0c15528c -r e1af3a725ca4 lisp/ChangeLog --- a/lisp/ChangeLog Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/ChangeLog Fri Oct 19 18:41:09 2007 +0000 @@ -1,3 +1,22 @@ +2007-10-19 Dan Nicolaescu + + * textmodes/two-column.el (2C-split, 2C-merge): + * textmodes/bib-mode.el (bib-find-key, mark-bib): + * progmodes/idlw-shell.el (idlwave-shell-move-or-history): + * progmodes/etags.el (find-tag-in-order, etags-tags-apropos) + * progmodes/ada-xref.el (ada-get-all-references): + * obsolete/mlsupport.el (ml-next-line, ml-previous-line): + * emulation/vi.el (vi-previous-line-first-nonwhite) + (vi-effective-range, vi-put-before): + * emulation/edt.el (edt-next-line, edt-previous-line) + (edt-paragraph-forward): Use forward-line. + + * progmodes/etags.el (tags-apropos): Require apropos at compile + time too. + + * progmodes/prolog.el: Require comint when compiling. + (inferior-prolog-flavor): Move defvar before use. + 2007-10-19 Richard Stallman * font-core.el (turn-on-font-lock-if-desired): diff -r a3bb0c15528c -r e1af3a725ca4 lisp/emulation/edt.el --- a/lisp/emulation/edt.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/emulation/edt.el Fri Oct 19 18:41:09 2007 +0000 @@ -649,7 +649,7 @@ (interactive "p") (edt-check-prefix num) (let ((beg (edt-current-line))) - (next-line num) + (forward-line num) (edt-bottom-check beg num)) (if edt-x-emacs19-p (setq zmacs-region-stays t))) @@ -659,7 +659,7 @@ (interactive "p") (edt-check-prefix num) (let ((beg (edt-current-line))) - (previous-line num) + (forward-line (- num)) (edt-top-check beg num)) (if edt-x-emacs19-p (setq zmacs-region-stays t))) @@ -1426,7 +1426,7 @@ (forward-paragraph (+ num 1)) (start-of-paragraph-text) (if (eolp) - (next-line 1)) + (forward-line 1)) (setq num (1- num))) (cond((> (point) far) (setq left (save-excursion (forward-line height))) diff -r a3bb0c15528c -r e1af3a725ca4 lisp/emulation/vi.el --- a/lisp/emulation/vi.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/emulation/vi.el Fri Oct 19 18:41:09 2007 +0000 @@ -801,7 +801,7 @@ (defun vi-previous-line-first-nonwhite (count) "Go up COUNT lines. Stop at first non-white." (interactive "p") - (previous-line count) + (forward-line (- count)) (back-to-indentation)) (defun vi-scroll-up-window (count) @@ -1062,7 +1062,7 @@ (setq end (1+ end))) ((eq moving-unit 'line) (goto-char begin) (beginning-of-line) (setq begin (point)) - (goto-char end) (next-line 1) (beginning-of-line) (setq end (point)))) + (goto-char end) (forward-line 1) (beginning-of-line) (setq end (point)))) (if (> end (point-max)) (setq end (point-max))) ; force in buffer region (cons begin end))))) @@ -1124,7 +1124,7 @@ (t (error "Register %c is not containing text string" reg)))) (if (vi-string-end-with-nl-p put-text) ; put back text as lines (if after-p - (progn (next-line 1) (beginning-of-line)) + (progn (forward-line 1) (beginning-of-line)) (beginning-of-line)) (if after-p (forward-char 1))) (push-mark (point)) diff -r a3bb0c15528c -r e1af3a725ca4 lisp/obsolete/mlsupport.el --- a/lisp/obsolete/mlsupport.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/obsolete/mlsupport.el Fri Oct 19 18:41:09 2007 +0000 @@ -186,10 +186,10 @@ (newline (ml-prefix-argument))) (defun ml-next-line () - (next-line (ml-prefix-argument))) + (forward-line (ml-prefix-argument))) (defun ml-previous-line () - (previous-line (ml-prefix-argument))) + (forward-line (- (ml-prefix-argument)))) (defun delete-to-kill-buffer () (kill-region (point) (mark))) diff -r a3bb0c15528c -r e1af3a725ca4 lisp/progmodes/ada-xref.el --- a/lisp/progmodes/ada-xref.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/progmodes/ada-xref.el Fri Oct 19 18:41:09 2007 +0000 @@ -1706,7 +1706,7 @@ (beginning-of-line) ;; while we have a continuation line, go up one line (while (looking-at "^\\.") - (previous-line 1) + (forward-line -1) (beginning-of-line)) (unless (looking-at (concat "[0-9]+.[0-9]+[ *]" (ada-name-of identlist) "[ <{=\(\[]")) @@ -1735,11 +1735,11 @@ (let ((current-line (buffer-substring (point) (save-excursion (end-of-line) (point))))) (save-excursion - (next-line 1) + (forward-line 1) (beginning-of-line) (while (looking-at "^\\.\\(.*\\)") (set 'current-line (concat current-line (match-string 1))) - (next-line 1)) + (forward-line 1)) ) (if (re-search-backward "^X [0-9]+ \\([a-zA-Z0-9_.-]+\\)" nil t) diff -r a3bb0c15528c -r e1af3a725ca4 lisp/progmodes/etags.el --- a/lisp/progmodes/etags.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/progmodes/etags.el Fri Oct 19 18:41:09 2007 +0000 @@ -1130,7 +1130,7 @@ (if (memq (car order) '(tag-exact-file-name-match-p tag-file-name-match-p tag-partial-file-name-match-p)) - (save-excursion (next-line 1) + (save-excursion (forward-line 1) (file-of-tag)) (file-of-tag))) tag-info (funcall snarf-tag-function)) @@ -1454,10 +1454,10 @@ (tag-info (save-excursion (funcall snarf-tag-function))) (tag (if (eq t (car tag-info)) nil (car tag-info))) (file-path (save-excursion (if tag (file-of-tag) - (save-excursion (next-line 1) + (save-excursion (forward-line 1) (file-of-tag))))) (file-label (if tag (file-of-tag t) - (save-excursion (next-line 1) + (save-excursion (forward-line 1) (file-of-tag t)))) (pt (with-current-buffer standard-output (point)))) (if tag @@ -1884,7 +1884,7 @@ (funcall tags-apropos-function regexp)))) (etags-tags-apropos-additional regexp)) (with-current-buffer "*Tags List*" - (require 'apropos) + (eval-and-compile (require 'apropos)) (apropos-mode) ;; apropos-mode is derived from fundamental-mode and it kills ;; all local variables. diff -r a3bb0c15528c -r e1af3a725ca4 lisp/progmodes/idlw-shell.el --- a/lisp/progmodes/idlw-shell.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/progmodes/idlw-shell.el Fri Oct 19 18:41:09 2007 +0000 @@ -1474,7 +1474,7 @@ (if (and idlwave-shell-arrows-do-history (>= (1+ (save-excursion (end-of-line) (point))) proc-pos)) (comint-previous-input arg) - (previous-line arg)))) + (forward-line (- arg))))) (defun idlwave-shell-up-or-history (&optional arg) "When in last line of process buffer, move to previous input. diff -r a3bb0c15528c -r e1af3a725ca4 lisp/progmodes/prolog.el --- a/lisp/progmodes/prolog.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/progmodes/prolog.el Fri Oct 19 18:41:09 2007 +0000 @@ -31,7 +31,7 @@ ;;; Code: -(defvar comint-prompt-regexp) +(eval-when-compile (require 'comint)) (defgroup prolog nil @@ -269,6 +269,12 @@ (defvar inferior-prolog-buffer nil) +(defvar inferior-prolog-flavor 'unknown + "Either a symbol or a buffer position offset by one. +If a buffer position, the flavor has not been determined yet and +it is expected that the process's output has been or will +be inserted at that position plus one.") + (defun inferior-prolog-run (&optional name) (with-current-buffer (make-comint "prolog" (or name prolog-program-name)) (inferior-prolog-mode) @@ -302,12 +308,6 @@ ;; Try again. (inferior-prolog-process)))) -(defvar inferior-prolog-flavor 'unknown - "Either a symbol or a buffer position offset by one. -If a buffer position, the flavor has not been determined yet and -it is expected that the process's output has been or will -be inserted at that position plus one.") - (defun inferior-prolog-guess-flavor (&optional ignored) (save-excursion (goto-char (1+ inferior-prolog-flavor)) diff -r a3bb0c15528c -r e1af3a725ca4 lisp/textmodes/bib-mode.el --- a/lisp/textmodes/bib-mode.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/textmodes/bib-mode.el Fri Oct 19 18:41:09 2007 +0000 @@ -127,7 +127,7 @@ ((null slots) (if (bobp) "" - (progn (previous-line 1) (bib-find-key bib-assoc)))) + (progn (forward-line -1) (bib-find-key bib-assoc)))) ((looking-at (car (car slots))) (cdr (car slots))) (t (bib-find-key (cdr slots))) @@ -181,7 +181,7 @@ (beginning-of-line nil) (push-mark (point)) (re-search-forward "^ *$" nil 2) - (next-line 1) + (forward-line 1) (beginning-of-line nil)) (defun unread-bib () diff -r a3bb0c15528c -r e1af3a725ca4 lisp/textmodes/two-column.el --- a/lisp/textmodes/two-column.el Fri Oct 19 17:27:58 2007 +0000 +++ b/lisp/textmodes/two-column.el Fri Oct 19 18:41:09 2007 +0000 @@ -463,7 +463,7 @@ (1+ (point))))) (delete-region point (point)) (setq n 0)) - (next-line 1))))) + (forward-line 1))))) @@ -531,7 +531,7 @@ (end-of-line) (indent-to-column 2C-window-width) (insert 2C-separator string)) - (next-line 1) ; add one if necessary + (forward-line 1) ; add one if necessary (set-buffer b2)))) (unless (window-full-width-p) (enlarge-window 99999 t)))