summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2004-04-16 12:51:06 +0000
committerKenichi Handa <handa@m17n.org>2004-04-16 12:51:06 +0000
commit6b61353c0a0320ee15bb6488149735381fed62ec (patch)
treee69adba60e504a5a37beb556ad70084de88a7aab /lisp/emulation
parentdc6a28319312fe81f7a1015e363174022313f0bd (diff)
downloademacs-6b61353c0a0320ee15bb6488149735381fed62ec.tar.gz
Sync to HEAD
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/crisp.el1
-rw-r--r--lisp/emulation/cua-base.el16
-rw-r--r--lisp/emulation/cua-gmrk.el1
-rw-r--r--lisp/emulation/cua-rect.el1
-rw-r--r--lisp/emulation/edt-lk201.el1
-rw-r--r--lisp/emulation/edt-mapper.el1
-rw-r--r--lisp/emulation/edt-pc.el1
-rw-r--r--lisp/emulation/edt-vt100.el1
-rw-r--r--lisp/emulation/edt.el1
-rw-r--r--lisp/emulation/keypad.el1
-rw-r--r--lisp/emulation/pc-mode.el1
-rw-r--r--lisp/emulation/pc-select.el1
-rw-r--r--lisp/emulation/tpu-edt.el3
-rw-r--r--lisp/emulation/tpu-extras.el1
-rw-r--r--lisp/emulation/tpu-mapper.el1
-rw-r--r--lisp/emulation/vi.el16
-rw-r--r--lisp/emulation/vip.el1
-rw-r--r--lisp/emulation/viper-cmd.el1
-rw-r--r--lisp/emulation/viper-ex.el5
-rw-r--r--lisp/emulation/viper-init.el1
-rw-r--r--lisp/emulation/viper-keym.el1
-rw-r--r--lisp/emulation/viper-macs.el1
-rw-r--r--lisp/emulation/viper-mous.el1
-rw-r--r--lisp/emulation/viper-util.el23
-rw-r--r--lisp/emulation/viper.el1
-rw-r--r--lisp/emulation/ws-mode.el1
26 files changed, 58 insertions, 26 deletions
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 0f19d9e4cc4..2ca819c0424 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -394,4 +394,5 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
(run-hooks 'crisp-load-hook)
(provide 'crisp)
+;;; arch-tag: e5369375-fafb-4240-b7ae-4cb460ef05ee
;;; crisp.el ends here
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 0de58dbf408..24f95ec21ea 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -419,19 +419,22 @@ Default is to load cursor color from initial or default frame parameters."
:group 'cua)
(defcustom cua-read-only-cursor-color "darkgreen"
- "*Cursor color used in read-only buffers, if non-nil."
+ "*Cursor color used in read-only buffers, if non-nil.
+Only used when `cua-enable-cursor-indications' is non-nil."
:type 'color
:group 'cua)
(defcustom cua-overwrite-cursor-color "yellow"
"*Cursor color used when overwrite mode is set, if non-nil.
-Also used to indicate that rectangle padding is in effect."
+Also used to indicate that rectangle padding is in effect.
+Only used when `cua-enable-cursor-indications' is non-nil."
:type 'color
:group 'cua)
(defcustom cua-global-mark-cursor-color "cyan"
"*Indication for active global mark.
-Will change cursor color to specified color if string."
+Will change cursor color to specified color if string.
+Only used when `cua-enable-cursor-indications' is non-nil."
:type 'color
:group 'cua)
@@ -850,7 +853,7 @@ of text."
With no prefix argument, clear mark if already set. Otherwise, set
mark, and push old mark position on local mark ring; also push mark on
-global mark ring if last mark was set in another buffer.
+global mark ring if last mark was set in another buffer.
With argument, jump to mark, and pop a new position for mark off
the local mark ring \(this does not affect the global mark ring\).
@@ -890,7 +893,9 @@ With a double \\[universal-argument] prefix argument, unconditionally set mark."
forward-word backward-word
end-of-line beginning-of-line
end-of-buffer beginning-of-buffer
- scroll-up scroll-down forward-paragraph backward-paragraph)
+ scroll-up scroll-down
+ forward-sentence backward-sentence
+ forward-paragraph backward-paragraph)
"List of standard movement commands.
Extra commands should be added to `cua-movement-commands'")
@@ -1248,4 +1253,5 @@ paste (in addition to the normal emacs bindings)."
(provide 'cua)
+;;; arch-tag: 21fb6289-ba25-4fee-bfdc-f9fb351acf05
;;; cua-base.el ends here
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index 4055fb2b1cc..8280691ae18 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -390,4 +390,5 @@ With prefix argument, don't jump to global mark when cancelling it."
(setq cua--global-mark-initialized t))
+;;; arch-tag: 553d8076-a91d-48ae-825d-6cb962a5f67f
;;; cua-gmrk.el ends here
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 47b315d062a..fefd7001029 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1382,4 +1382,5 @@ With prefix arg, indent to that column."
(setq cua--rectangle-initialized t))
+;;; arch-tag: b730df53-17b9-4a89-bd63-4a71ec196731
;;; cua-rect.el ends here
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 6afadd6c167..e63fd84cbe7 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -57,4 +57,5 @@
("HELP" . [help]) ("DO" . [menu]) ("F17" . [f17]) ("F18" . [f18])
("F19" . [f19]) ("F20" . [f20])))
+;;; arch-tag: 36f498cf-c3f6-41b0-911b-83b1348855ec
;;; edt-lk201.el ends here
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index d983ea8e714..e4943ff4a0a 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -521,4 +521,5 @@
(sit-for 600)
(kill-emacs t)
+;;; arch-tag: 9eea59c8-b8b7-4d66-b858-c8920624c518
;;; edt-mapper.el ends here
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 30e1b535469..509f4f498ce 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -87,4 +87,5 @@
("HELP" . "" ) ("DO" . "" ) ("F17" . "" ) ("F18" . "" )
("F19" . "" ) ("F20" . "" )))
+;;; arch-tag: 4593d053-183a-4062-97de-57b8877595ce
;;; edt-pc.el ends here
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index 283b7827c73..0ad749ec13f 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -46,4 +46,5 @@
"Set terminal width to 132 columns."
(vt100-wide-mode 1))
+;;; arch-tag: c9f10c95-915f-44b5-93ff-4654abca4dd4
;;; edt-vt100.el ends here
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 427a803da88..ff0298e9a17 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -2701,4 +2701,5 @@ G-C-\\: Split Window | FNDNXT | Yank | CUT |
(provide 'edt)
+;;; arch-tag: 18d1c54f-6900-4078-8bbc-7c2292f48941
;;; edt.el ends here
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 47c9fead294..5cf1d7c2e53 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -271,4 +271,5 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
(setq i (1+ i)))))
+;;; arch-tag: 0899d2bd-9e12-4b4e-9aef-d0014d3b6414
;;; keypad.el ends here
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index 22c5b289f08..8b4d0d79f28 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -54,4 +54,5 @@ C-Escape does list-buffers."
(provide 'pc-mode)
+;;; arch-tag: df007c05-f885-4cd0-8c1e-487d0f8dd9c9
;;; pc-mode.el ends here
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 6b7b7ece9c8..c7ea973467f 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -982,4 +982,5 @@ You must modify via \\[customize] for this variable to have an effect."
:group 'pc-select
:require 'pc-select)
+;;; arch-tag: 10697b70-ae07-4f3e-ad23-7814a3f418c2
;;; pc-select.el ends here
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 1296d497960..b164588d8f1 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -551,7 +551,7 @@ version of Emacs."
(t (mark))))
(defun tpu-set-mark (pos)
- "TPU-edt verion of the `set-mark' function.
+ "TPU-edt version of the `set-mark' function.
Sets the mark at POS and activates the region according to the
current version of Emacs."
(set-mark pos)
@@ -2522,4 +2522,5 @@ If FILE is nil, try to load a default file. The default file names are
(provide 'tpu-edt)
+;;; arch-tag: f3dfe61c-2cbd-4f73-b9cc-eb215020b857
;;; tpu-edt.el ends here
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index 465b923f891..ced88ff3fdf 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -480,4 +480,5 @@ version that respects the bottom scroll margin."
GOLD-map)
(message "The cursor is now bound to the flow of your text."))
+;;; arch-tag: 89676fa4-33ec-48cb-9135-6f3bf230ab1a
;;; tpu-extras.el ends here
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index e6a50c074dc..68a760e2011 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -392,4 +392,5 @@
")
(goto-char (point-min))
+;;; arch-tag: bab5872f-cd3a-4c1c-aedb-047b67646f6c
;;; tpu-mapper.el ends here
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index 7ae43c8b162..4e17644e66a 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -455,7 +455,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs."
(vi-mode-setup))
(if (eq major-mode 'vi-mode)
- (message "Already in vi-mode." (ding))
+ (progn (ding) (message "Already in vi-mode."))
(setq vi-mode-old-local-map (current-local-map))
(setq vi-mode-old-mode-name mode-name)
(setq vi-mode-old-major-mode major-mode)
@@ -703,7 +703,7 @@ use those instead of the ones saved."
regexp-search-ring
search-ring))))
(if (null search-command)
- (message "No last search command to repeat." (ding))
+ (progn (ding) (message "No last search command to repeat."))
(funcall search-command search-string nil nil arg)))
(defun vi-reverse-last-search (arg &optional search-command search-string)
@@ -718,7 +718,7 @@ If the optional search args are given, use those instead of the ones saved."
regexp-search-ring
search-ring))))
(if (null search-command)
- (message "No last search command to repeat." (ding))
+ (progn (ding) (message "No last search command to repeat."))
(funcall (cond ((eq search-command 're-search-forward) 're-search-backward)
((eq search-command 're-search-backward) 're-search-forward)
((eq search-command 'search-forward) 'search-backward)
@@ -838,7 +838,7 @@ Goto mark '@' means jump into and pop the top mark on the mark ring."
(t
(let ((mark (vi-get-mark mark-char)))
(if (null mark)
- (message "Mark register undefined." (vi-ding))
+ (progn (vi-ding) (message "Mark register undefined."))
(set-mark-command nil)
(goto-char mark)
(if line-flag (back-to-indentation)))))))
@@ -881,7 +881,7 @@ is given, it is used instead of the saved one."
(interactive "p")
(if (null find-arg) (setq find-arg vi-last-find-char))
(if (null find-arg)
- (message "No last find char to repeat." (ding))
+ (progn (ding) (message "No last find char to repeat."))
(vi-find-char (cons (* (car find-arg) -1) (cdr find-arg)) count))) ;6/13/86
(defun vi-find-char (arg count)
@@ -909,7 +909,7 @@ it is used instead of the saved one."
(interactive "p")
(if (null find-arg) (setq find-arg vi-last-find-char))
(if (null find-arg)
- (message "No last find char to repeat." (ding))
+ (progn (ding) (message "No last find char to repeat."))
(vi-find-char find-arg count)))
(defun vi-backward-find-char (count char)
@@ -1465,7 +1465,8 @@ It assumes a `(def..' always starts at the beginning of a line."
(goto-char (point-min))
(if (re-search-forward (concat "^(def[unvarconst ]*" name) nil t)
nil
- (message "No definition for \"%s\" in current file." name (ding))
+ (ding)
+ (message "No definition for \"%s\" in current file." name)
(set-mark-command t))))
(defun vi-split-open-line (arg)
@@ -1486,4 +1487,5 @@ With ARG, inserts that many newlines."
(provide 'vi)
+;;; arch-tag: ac9bdac3-8acb-4ddd-bdae-c6dd873153b3
;;; vi.el ends here
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 80e941d2ed6..cbb0aa55aa8 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -3072,4 +3072,5 @@ vip-s-string"
(provide 'vip)
+;;; arch-tag: bff623ef-48f7-41d4-9aa3-2e840c9ab415
;;; vip.el ends here
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 02bffa64bd3..eb5e5ede4c7 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -4947,4 +4947,5 @@ Mail anyway (y or n)? ")
+;;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
;;; viper-cmd.el ends here
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index f4d3e8c766e..c94edf54bc2 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -1,6 +1,6 @@
;;; viper-ex.el --- functions implementing the Ex commands for Viper
-;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02, 04 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@ -1458,7 +1458,7 @@ reversed."
(if (eq 1 (length name))
(setq char (string-to-char name))
(error "`%s': Spurious text \"%s\" after mark name"
- name (substring name 1) viper-SpuriousText))
+ name (substring name 1)))
(save-window-excursion
(setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
(set-buffer viper-ex-work-buf)
@@ -2318,4 +2318,5 @@ Type 'mak ' (including the space) to run make with no args."
+;;; arch-tag: 56b80d36-f880-4d10-bd66-85ad91a295db
;;; viper-ex.el ends here
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 8787e2eaa6f..2a13f00535e 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -1009,4 +1009,5 @@ Should be set in `~/.viper' file."
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;;; End:
+;;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
;;; viper-init.el ends here
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 2369346a3ff..146b54b7034 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -637,4 +637,5 @@ form ((key . function) (key . function) ... )."
;;; End:
+;;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
;;; viper-keym.el ends here
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index b13c922188b..c6a3fdfe1fe 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -929,4 +929,5 @@ name from there."
(call-last-kbd-macro)))
+;;; arch-tag: ecd3cc5c-8cd0-4bbe-b2ec-7e75a4b7d0aa
;;; viper-macs.el ends here
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 1889a901e88..250f7cf5a53 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -674,4 +674,5 @@ This buffer may be different from the one where the click occurred."
;;; End:
+;;; arch-tag: e56b2390-06c4-4dd1-96f5-c7876e2d8c2f
;;; viper-mous.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index fc7f0c8223b..5e533e5f545 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -394,17 +394,17 @@
command)))
(goto-char (point-min))
;; Issue an error, if no match.
- (if (> status 0)
- (save-excursion
- (skip-chars-forward " \t\n\j")
- (if (looking-at "ls:")
- (viper-forward-Word 1))
- (error "%s: %s"
- (if (stringp gshell)
- gshell
- "shell")
- (buffer-substring (point) (viper-line-pos 'end)))
- ))
+ (unless (eq 0 status)
+ (save-excursion
+ (skip-chars-forward " \t\n\j")
+ (if (looking-at "ls:")
+ (viper-forward-Word 1))
+ (error "%s: %s"
+ (if (stringp gshell)
+ gshell
+ "shell")
+ (buffer-substring (point) (viper-line-pos 'end)))
+ ))
(goto-char (point-min))
(viper-get-filenames-from-buffer 'one-per-line))
))
@@ -1517,4 +1517,5 @@ This option is appropriate if you like Emacs-style words."
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;;; End:
+;;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
;;; viper-util.el ends here
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index f5837192ce1..15ec74b41f1 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1285,4 +1285,5 @@ These two lines must come in the order given.
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;;; End:
+;;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
;;; viper.el ends here
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 330506b1029..54be36299c5 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -755,4 +755,5 @@ sWith: " )
(provide 'ws-mode)
+;;; arch-tag: 6dd864bf-2ccb-4d59-af6e-492eba2890a3
;;; ws-mode.el ends here