From 5f68c1b73688b4bae978c83e13d84051474e1a74 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 1 Sep 2009 03:18:44 +0000 Subject: [PATCH] Use forward-line rather than goto-line. --- lisp/ChangeLog | 22 ++++++++++++++++++++++ lisp/progmodes/flymake.el | 9 ++++++--- lisp/progmodes/gdb-mi.el | 9 ++++++--- lisp/progmodes/idlw-shell.el | 3 ++- lisp/progmodes/python.el | 6 ++++-- lisp/progmodes/verilog-mode.el | 3 ++- lisp/term/ns-win.el | 7 ++++--- lisp/textmodes/bibtex.el | 6 ++++-- 8 files changed, 50 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b31edc129ae..280d258cca4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,27 @@ 2009-09-01 Glenn Morris + * net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-image-menu) + (eudc-bob-sound-menu): Use defvar rather than defconst, since + easy-menu-define wants to modify these. + + * net/net-utils.el (nslookup): Use make-comint rather than comint-run. + + * net/browse-url.el (browse-url-file-url): + * term/internal.el (dos-codepage-setup): + Use default-value rather than default-enable-multibyte-characters. + + * progmodes/flymake.el (flymake-highlight-line) + (flymake-goto-file-and-line, flymake-goto-line): + * progmodes/gdb-mi.el (gdb-mouse-until, gdb-mouse-jump) + (gdb-goto-breakpoint): + * progmodes/idlw-shell.el (idlwave-shell-move-to-bp): + * progmodes/python.el (python-find-function) + (python-pdbtrack-track-stack-file): + * progmodes/verilog-mode.el (verilog-surelint-off): + * term/ns-win.el (ns-open-file-select-line): + * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally): + Use forward-line rather than goto-line. + * textmodes/reftex-cite.el (reftex-offer-bib-menu): * textmodes/reftex-index.el (reftex-display-index): * textmodes/reftex-ref.el (reftex-offer-label-menu): diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 549bf4abe63..69eac565892 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -805,7 +805,8 @@ Return t if it has at least one flymake overlay, nil if no overlay." (defun flymake-highlight-line (line-no line-err-info-list) "Highlight line LINE-NO in current buffer. Perhaps use text from LINE-ERR-INFO-LIST to enhance highlighting." - (goto-line line-no) + (goto-char (point-min)) + (forward-line (1- line-no)) (let* ((line-beg (flymake-line-beginning-position)) (line-end (flymake-line-end-position)) (beg line-beg) @@ -1269,7 +1270,8 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'." (if (not (file-exists-p file)) (flymake-log 1 "File %s does not exist" file) (find-file file) - (goto-line line))) + (goto-char (point-min)) + (forward-line (1- line)))) ;; flymake minor mode declarations (defvar flymake-mode-line nil) @@ -1443,7 +1445,8 @@ With arg, turn Flymake mode on if and only if arg is positive." (defun flymake-goto-line (line-no) "Go to line LINE-NO, then skip whitespace." - (goto-line line-no) + (goto-char (point-min)) + (forward-line (1- line-no)) (flymake-skip-whitespace)) (defun flymake-goto-next-error () diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 2eb11df492e..63896d4a77a 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -910,7 +910,8 @@ with mouse-1 (default bindings)." (gud-call (concat "until " (number-to-string line)))) (gdb-if-arrow gdb-disassembly-position (save-excursion - (goto-line (line-number-at-pos (posn-point end))) + (goto-char (point-min)) + (forward-line (1- (line-number-at-pos (posn-point end)))) (forward-char 2) (gud-call (concat "until *%a")))))) @@ -930,7 +931,8 @@ line, and no execution takes place." (gud-call (concat "jump " (number-to-string line))))) (gdb-if-arrow gdb-disassembly-position (save-excursion - (goto-line (line-number-at-pos (posn-point end))) + (goto-char (point-min)) + (forward-line (1- (line-number-at-pos (posn-point end)))) (forward-char 2) (progn (gud-call (concat "tbreak *%a")) @@ -3337,7 +3339,8 @@ breakpoints buffer." (display-buffer buffer)))) (setq gdb-source-window window) (with-current-buffer buffer - (goto-line (string-to-number line)) + (goto-char (point-min)) + (forward-line (1- (string-to-number line))) (set-window-point window (point)))))) (error "Not recognized as break/watchpoint line"))))) diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 40418d7ad7f..2f959464415 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -2790,7 +2790,8 @@ Runs to the last statement and then steps 1 statement. Use the .out command." (or (not bp-line) (funcall closer-func cur-line bp-line))) (setq bp-line cur-line)))) (unless bp-line (error "No further breakpoints")) - (goto-line bp-line))) + (goto-char (point-min)) + (forward-line (1- bp-line)))) ;; Examine Commands ------------------------------------------------------ diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 308af6c02cc..4582163e17b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2203,7 +2203,8 @@ Interactively, prompt for name." (unless file (error "Don't know where `%s' is defined" name)) (pop-to-buffer (find-file-noselect file)) (when (integerp line) - (goto-line line)))) + (goto-char (point-min)) + (forward-line (1- line))))) ;;;; Skeletons @@ -2614,7 +2615,8 @@ find it." target_buffer (cadr target) target_fname (buffer-file-name target_buffer)) (switch-to-buffer-other-window target_buffer) - (goto-line target_lineno) + (goto-char (point-min)) + (forward-line (1- target_lineno)) (message "pdbtrack: line %s, file %s" target_lineno target_fname) (python-pdbtrack-overlay-arrow t) (pop-to-buffer origbuf t) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 57a51fd2187..557d587e6f3 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -4071,7 +4071,8 @@ becomes: (and (file-exists-p name) (find-file-noselect name)))))))) (switch-to-buffer buffer) - (goto-line (string-to-number line)) + (goto-char (point-min)) + (forward-line (- (string-to-number line))) (end-of-line) (catch 'already (cond diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 4435b6cbf04..a92a5c5305d 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -723,9 +723,10 @@ Lines are highlighted according to `ns-input-line'." (if ns-select-overlay (setq ns-select-overlay (delete-overlay ns-select-overlay))) (deactivate-mark) - (goto-line (if (consp ns-input-line) - (min (car ns-input-line) (cdr ns-input-line)) - ns-input-line))) + (goto-char (point-min)) + (forward-line (1- (if (consp ns-input-line) + (min (car ns-input-line) (cdr ns-input-line)) + ns-input-line)))) (ns-input-line (if (not ns-select-overlay) (overlay-put (setq ns-select-overlay (make-overlay (point-min) diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index a45a187354e..4276c3d7fad 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -3845,7 +3845,8 @@ Return t if test was successful, nil otherwise." (insert (format "%s:%d: %s\n" file (car err) (cdr err)))) (set-buffer-modified-p nil) (toggle-read-only 1) - (goto-line 3)) ; first error message + (goto-char (point-min)) + (forward-line 2)) ; first error message (display-buffer err-buf) nil) ; return `nil' (i.e., buffer is invalid) (message "%s is syntactically correct" @@ -3902,7 +3903,8 @@ Return t if test was successful, nil otherwise." (dolist (err (sort error-list 'string-lessp)) (insert err)) (set-buffer-modified-p nil) (toggle-read-only 1) - (goto-line 3)) ; first error message + (goto-char (point-min)) + (forward-line 2)) ; first error message (display-buffer err-buf) nil) ; return `nil' (i.e., buffer is invalid) (message "No duplicate keys.") -- 2.39.2