diff options
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 12 |
3 files changed, 9 insertions, 11 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index c0a688195ca..efc6747de48 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -3609,7 +3609,7 @@ Otherwise reindent just the current line." | |||
| 3609 | (save-excursion | 3609 | (save-excursion |
| 3610 | (goto-char end) | 3610 | (goto-char end) |
| 3611 | (point-marker)) | 3611 | (point-marker)) |
| 3612 | (nth 1 (current-time)) | 3612 | (encode-time nil 'integer) |
| 3613 | context)) | 3613 | context)) |
| 3614 | (message "Indenting region...")) | 3614 | (message "Indenting region...")) |
| 3615 | )) | 3615 | )) |
| @@ -3617,7 +3617,7 @@ Otherwise reindent just the current line." | |||
| 3617 | (defun c-progress-update () | 3617 | (defun c-progress-update () |
| 3618 | (if (not (and c-progress-info c-progress-interval)) | 3618 | (if (not (and c-progress-info c-progress-interval)) |
| 3619 | nil | 3619 | nil |
| 3620 | (let ((now (nth 1 (current-time))) | 3620 | (let ((now (encode-time nil 'integer)) |
| 3621 | (start (aref c-progress-info 0)) | 3621 | (start (aref c-progress-info 0)) |
| 3622 | (end (aref c-progress-info 1)) | 3622 | (end (aref c-progress-info 1)) |
| 3623 | (lastsecs (aref c-progress-info 2))) | 3623 | (lastsecs (aref c-progress-info 2))) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index b83947f9034..cb69a43b63f 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -8675,9 +8675,7 @@ start with default arguments, then refine the slowdown regions." | |||
| 8675 | (or l (setq l 1)) | 8675 | (or l (setq l 1)) |
| 8676 | (or step (setq step 500)) | 8676 | (or step (setq step 500)) |
| 8677 | (or lim (setq lim 40)) | 8677 | (or lim (setq lim 40)) |
| 8678 | (let* ((timems (function (lambda () | 8678 | (let* ((timems (function (lambda () (car (encode-time nil 1000))))) |
| 8679 | (let ((tt (current-time))) | ||
| 8680 | (+ (* 1000 (nth 1 tt)) (/ (nth 2 tt) 1000)))))) | ||
| 8681 | (tt (funcall timems)) (c 0) delta tot) | 8679 | (tt (funcall timems)) (c 0) delta tot) |
| 8682 | (goto-char (point-min)) | 8680 | (goto-char (point-min)) |
| 8683 | (forward-line (1- l)) | 8681 | (forward-line (1- l)) |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 3bcf9e50f05..27380b33adb 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -7392,8 +7392,8 @@ only-lines." | |||
| 7392 | (defun vhdl-update-progress-info (string pos) | 7392 | (defun vhdl-update-progress-info (string pos) |
| 7393 | "Update progress information." | 7393 | "Update progress information." |
| 7394 | (when (and vhdl-progress-info (not noninteractive) | 7394 | (when (and vhdl-progress-info (not noninteractive) |
| 7395 | (< vhdl-progress-interval | 7395 | (time-less-p vhdl-progress-interval |
| 7396 | (- (nth 1 (current-time)) (aref vhdl-progress-info 2)))) | 7396 | (time-subtract nil (aref vhdl-progress-info 2)))) |
| 7397 | (let ((delta (- (aref vhdl-progress-info 1) | 7397 | (let ((delta (- (aref vhdl-progress-info 1) |
| 7398 | (aref vhdl-progress-info 0)))) | 7398 | (aref vhdl-progress-info 0)))) |
| 7399 | (message "%s... (%2d%%)" string | 7399 | (message "%s... (%2d%%)" string |
| @@ -7401,7 +7401,7 @@ only-lines." | |||
| 7401 | 100 | 7401 | 100 |
| 7402 | (floor (* 100.0 (- pos (aref vhdl-progress-info 0))) | 7402 | (floor (* 100.0 (- pos (aref vhdl-progress-info 0))) |
| 7403 | delta)))) | 7403 | delta)))) |
| 7404 | (aset vhdl-progress-info 2 (nth 1 (current-time))))) | 7404 | (aset vhdl-progress-info 2 (encode-time nil 'integer)))) |
| 7405 | 7405 | ||
| 7406 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7406 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 7407 | ;; Indentation commands | 7407 | ;; Indentation commands |
| @@ -8142,12 +8142,12 @@ depending on parameter UPPER-CASE." | |||
| 8142 | (upcase-word -1) | 8142 | (upcase-word -1) |
| 8143 | (downcase-word -1))) | 8143 | (downcase-word -1))) |
| 8144 | (when (and count vhdl-progress-interval (not noninteractive) | 8144 | (when (and count vhdl-progress-interval (not noninteractive) |
| 8145 | (< vhdl-progress-interval | 8145 | (time-less-p vhdl-progress-interval |
| 8146 | (- (nth 1 (current-time)) last-update))) | 8146 | (time-subtract nil last-update))) |
| 8147 | (message "Fixing case... (%2d%s)" | 8147 | (message "Fixing case... (%2d%s)" |
| 8148 | (+ (* count 20) (/ (* 20 (- (point) beg)) (- end beg))) | 8148 | (+ (* count 20) (/ (* 20 (- (point) beg)) (- end beg))) |
| 8149 | "%") | 8149 | "%") |
| 8150 | (setq last-update (nth 1 (current-time))))) | 8150 | (setq last-update (encode-time nil 'integer)))) |
| 8151 | (goto-char end))))) | 8151 | (goto-char end))))) |
| 8152 | 8152 | ||
| 8153 | (defun vhdl-fix-case-region (beg end &optional arg) | 8153 | (defun vhdl-fix-case-region (beg end &optional arg) |