Commit 7caf6803 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 35a46c5c
2007-10-19 Dan Nicolaescu <dann@ics.uci.edu>
* 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 <rms@gnu.org> 2007-10-19 Richard Stallman <rms@gnu.org>
* font-core.el (turn-on-font-lock-if-desired): * font-core.el (turn-on-font-lock-if-desired):
......
...@@ -649,7 +649,7 @@ Argument NUM is the number of lines to move." ...@@ -649,7 +649,7 @@ Argument NUM is the number of lines to move."
(interactive "p") (interactive "p")
(edt-check-prefix num) (edt-check-prefix num)
(let ((beg (edt-current-line))) (let ((beg (edt-current-line)))
(next-line num) (forward-line num)
(edt-bottom-check beg num)) (edt-bottom-check beg num))
(if edt-x-emacs19-p (setq zmacs-region-stays t))) (if edt-x-emacs19-p (setq zmacs-region-stays t)))
...@@ -659,7 +659,7 @@ Argument NUM is the number of lines to move." ...@@ -659,7 +659,7 @@ Argument NUM is the number of lines to move."
(interactive "p") (interactive "p")
(edt-check-prefix num) (edt-check-prefix num)
(let ((beg (edt-current-line))) (let ((beg (edt-current-line)))
(previous-line num) (forward-line (- num))
(edt-top-check beg num)) (edt-top-check beg num))
(if edt-x-emacs19-p (setq zmacs-region-stays t))) (if edt-x-emacs19-p (setq zmacs-region-stays t)))
...@@ -1426,7 +1426,7 @@ Argument NUM is the positive number of paragraphs to move." ...@@ -1426,7 +1426,7 @@ Argument NUM is the positive number of paragraphs to move."
(forward-paragraph (+ num 1)) (forward-paragraph (+ num 1))
(start-of-paragraph-text) (start-of-paragraph-text)
(if (eolp) (if (eolp)
(next-line 1)) (forward-line 1))
(setq num (1- num))) (setq num (1- num)))
(cond((> (point) far) (cond((> (point) far)
(setq left (save-excursion (forward-line height))) (setq left (save-excursion (forward-line height)))
......
...@@ -801,7 +801,7 @@ The given COUNT is remembered for future scrollings." ...@@ -801,7 +801,7 @@ The given COUNT is remembered for future scrollings."
(defun vi-previous-line-first-nonwhite (count) (defun vi-previous-line-first-nonwhite (count)
"Go up COUNT lines. Stop at first non-white." "Go up COUNT lines. Stop at first non-white."
(interactive "p") (interactive "p")
(previous-line count) (forward-line (- count))
(back-to-indentation)) (back-to-indentation))
(defun vi-scroll-up-window (count) (defun vi-scroll-up-window (count)
...@@ -1062,7 +1062,7 @@ MOTION-COMMAND with ARG. ...@@ -1062,7 +1062,7 @@ MOTION-COMMAND with ARG.
(setq end (1+ end))) (setq end (1+ end)))
((eq moving-unit 'line) ((eq moving-unit 'line)
(goto-char begin) (beginning-of-line) (setq begin (point)) (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 (if (> end (point-max)) (setq end (point-max))) ; force in buffer region
(cons begin end))))) (cons begin end)))))
...@@ -1124,7 +1124,7 @@ text as lines. If the optional after-p is given, put after/below the cursor." ...@@ -1124,7 +1124,7 @@ text as lines. If the optional after-p is given, put after/below the cursor."
(t (error "Register %c is not containing text string" reg)))) (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 (vi-string-end-with-nl-p put-text) ; put back text as lines
(if after-p (if after-p
(progn (next-line 1) (beginning-of-line)) (progn (forward-line 1) (beginning-of-line))
(beginning-of-line)) (beginning-of-line))
(if after-p (forward-char 1))) (if after-p (forward-char 1)))
(push-mark (point)) (push-mark (point))
......
...@@ -186,10 +186,10 @@ ...@@ -186,10 +186,10 @@
(newline (ml-prefix-argument))) (newline (ml-prefix-argument)))
(defun ml-next-line () (defun ml-next-line ()
(next-line (ml-prefix-argument))) (forward-line (ml-prefix-argument)))
(defun ml-previous-line () (defun ml-previous-line ()
(previous-line (ml-prefix-argument))) (forward-line (- (ml-prefix-argument))))
(defun delete-to-kill-buffer () (defun delete-to-kill-buffer ()
(kill-region (point) (mark))) (kill-region (point) (mark)))
......
...@@ -1706,7 +1706,7 @@ Information is extracted from the ali file." ...@@ -1706,7 +1706,7 @@ Information is extracted from the ali file."
(beginning-of-line) (beginning-of-line)
;; while we have a continuation line, go up one line ;; while we have a continuation line, go up one line
(while (looking-at "^\\.") (while (looking-at "^\\.")
(previous-line 1) (forward-line -1)
(beginning-of-line)) (beginning-of-line))
(unless (looking-at (concat "[0-9]+.[0-9]+[ *]" (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
(ada-name-of identlist) "[ <{=\(\[]")) (ada-name-of identlist) "[ <{=\(\[]"))
...@@ -1735,11 +1735,11 @@ Information is extracted from the ali file." ...@@ -1735,11 +1735,11 @@ Information is extracted from the ali file."
(let ((current-line (buffer-substring (let ((current-line (buffer-substring
(point) (save-excursion (end-of-line) (point))))) (point) (save-excursion (end-of-line) (point)))))
(save-excursion (save-excursion
(next-line 1) (forward-line 1)
(beginning-of-line) (beginning-of-line)
(while (looking-at "^\\.\\(.*\\)") (while (looking-at "^\\.\\(.*\\)")
(set 'current-line (concat current-line (match-string 1))) (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) (if (re-search-backward "^X [0-9]+ \\([a-zA-Z0-9_.-]+\\)" nil t)
......
...@@ -1130,7 +1130,7 @@ where they were found." ...@@ -1130,7 +1130,7 @@ where they were found."
(if (memq (car order) '(tag-exact-file-name-match-p (if (memq (car order) '(tag-exact-file-name-match-p
tag-file-name-match-p tag-file-name-match-p
tag-partial-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))
(file-of-tag))) (file-of-tag)))
tag-info (funcall snarf-tag-function)) tag-info (funcall snarf-tag-function))
...@@ -1454,10 +1454,10 @@ where they were found." ...@@ -1454,10 +1454,10 @@ where they were found."
(tag-info (save-excursion (funcall snarf-tag-function))) (tag-info (save-excursion (funcall snarf-tag-function)))
(tag (if (eq t (car tag-info)) nil (car tag-info))) (tag (if (eq t (car tag-info)) nil (car tag-info)))
(file-path (save-excursion (if tag (file-of-tag) (file-path (save-excursion (if tag (file-of-tag)
(save-excursion (next-line 1) (save-excursion (forward-line 1)
(file-of-tag))))) (file-of-tag)))))
(file-label (if tag (file-of-tag t) (file-label (if tag (file-of-tag t)
(save-excursion (next-line 1) (save-excursion (forward-line 1)
(file-of-tag t)))) (file-of-tag t))))
(pt (with-current-buffer standard-output (point)))) (pt (with-current-buffer standard-output (point))))
(if tag (if tag
...@@ -1884,7 +1884,7 @@ directory specification." ...@@ -1884,7 +1884,7 @@ directory specification."
(funcall tags-apropos-function regexp)))) (funcall tags-apropos-function regexp))))
(etags-tags-apropos-additional regexp)) (etags-tags-apropos-additional regexp))
(with-current-buffer "*Tags List*" (with-current-buffer "*Tags List*"
(require 'apropos) (eval-and-compile (require 'apropos))
(apropos-mode) (apropos-mode)
;; apropos-mode is derived from fundamental-mode and it kills ;; apropos-mode is derived from fundamental-mode and it kills
;; all local variables. ;; all local variables.
......
...@@ -1474,7 +1474,7 @@ Otherwise just move the line. Move down unless UP is non-nil." ...@@ -1474,7 +1474,7 @@ Otherwise just move the line. Move down unless UP is non-nil."
(if (and idlwave-shell-arrows-do-history (if (and idlwave-shell-arrows-do-history
(>= (1+ (save-excursion (end-of-line) (point))) proc-pos)) (>= (1+ (save-excursion (end-of-line) (point))) proc-pos))
(comint-previous-input arg) (comint-previous-input arg)
(previous-line arg)))) (forward-line (- arg)))))
(defun idlwave-shell-up-or-history (&optional arg) (defun idlwave-shell-up-or-history (&optional arg)
"When in last line of process buffer, move to previous input. "When in last line of process buffer, move to previous input.
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
;;; Code: ;;; Code:
(defvar comint-prompt-regexp) (eval-when-compile (require 'comint))
(defgroup prolog nil (defgroup prolog nil
...@@ -269,6 +269,12 @@ Return not at end copies rest of line to end and sends it. ...@@ -269,6 +269,12 @@ Return not at end copies rest of line to end and sends it.
(defvar inferior-prolog-buffer nil) (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) (defun inferior-prolog-run (&optional name)
(with-current-buffer (make-comint "prolog" (or name prolog-program-name)) (with-current-buffer (make-comint "prolog" (or name prolog-program-name))
(inferior-prolog-mode) (inferior-prolog-mode)
...@@ -302,12 +308,6 @@ Return not at end copies rest of line to end and sends it. ...@@ -302,12 +308,6 @@ Return not at end copies rest of line to end and sends it.
;; Try again. ;; Try again.
(inferior-prolog-process)))) (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) (defun inferior-prolog-guess-flavor (&optional ignored)
(save-excursion (save-excursion
(goto-char (1+ inferior-prolog-flavor)) (goto-char (1+ inferior-prolog-flavor))
......
...@@ -127,7 +127,7 @@ with the cdr.") ...@@ -127,7 +127,7 @@ with the cdr.")
((null slots) ((null slots)
(if (bobp) (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))) ((looking-at (car (car slots)))
(cdr (car slots))) (cdr (car slots)))
(t (bib-find-key (cdr slots))) (t (bib-find-key (cdr slots)))
...@@ -181,7 +181,7 @@ with the cdr.") ...@@ -181,7 +181,7 @@ with the cdr.")
(beginning-of-line nil) (beginning-of-line nil)
(push-mark (point)) (push-mark (point))
(re-search-forward "^ *$" nil 2) (re-search-forward "^ *$" nil 2)
(next-line 1) (forward-line 1)
(beginning-of-line nil)) (beginning-of-line nil))
(defun unread-bib () (defun unread-bib ()
......
...@@ -463,7 +463,7 @@ First column's text sSs Second column's text ...@@ -463,7 +463,7 @@ First column's text sSs Second column's text
(1+ (point))))) (1+ (point)))))
(delete-region point (point)) (delete-region point (point))
(setq n 0)) (setq n 0))
(next-line 1))))) (forward-line 1)))))
...@@ -531,7 +531,7 @@ off trailing spaces with \\[delete-trailing-whitespace]." ...@@ -531,7 +531,7 @@ off trailing spaces with \\[delete-trailing-whitespace]."
(end-of-line) (end-of-line)
(indent-to-column 2C-window-width) (indent-to-column 2C-window-width)
(insert 2C-separator string)) (insert 2C-separator string))
(next-line 1) ; add one if necessary (forward-line 1) ; add one if necessary
(set-buffer b2)))) (set-buffer b2))))
(unless (window-full-width-p) (unless (window-full-width-p)
(enlarge-window 99999 t))) (enlarge-window 99999 t)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment