diff options
| author | Adrian Robert | 2008-08-21 02:31:45 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-08-21 02:31:45 +0000 |
| commit | 795d93585c7129fc45d369ec0843c84212fca213 (patch) | |
| tree | d337f9573b4d9f8144981bbbbbb7f105de93083c | |
| parent | a8d207a917351b9614fc78b922761dc4aa160cfe (diff) | |
| download | emacs-795d93585c7129fc45d369ec0843c84212fca213.tar.gz emacs-795d93585c7129fc45d369ec0843c84212fca213.zip | |
* term/ns-win.el (ns-cursor-blink-rate, ns-cursor-blink-mode): Remove.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 27 |
2 files changed, 5 insertions, 27 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 530bbd94dbc..ef23d308cc3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-08-20 David Reitter <david.reitter@gmail.com> | ||
| 2 | |||
| 3 | * term/ns-win.el (ns-cursor-blink-rate, ns-cursor-blink-mode): Remove. | ||
| 4 | Patch applied by Adrian Robert. | ||
| 5 | |||
| 1 | 2008-08-20 Kevin Ryde <user42@zip.com.au> | 6 | 2008-08-20 Kevin Ryde <user42@zip.com.au> |
| 2 | 7 | ||
| 3 | * textmodes/nroff-mode.el (nroff-mode): Avoid auto-filling on | 8 | * textmodes/nroff-mode.el (nroff-mode): Avoid auto-filling on |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index e5cacf8df3c..94f0806e985 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | ;; nsterm.m | 59 | ;; nsterm.m |
| 60 | (defvar ns-version-string) | 60 | (defvar ns-version-string) |
| 61 | (defvar ns-expand-space) | 61 | (defvar ns-expand-space) |
| 62 | (defvar ns-cursor-blink-rate) | ||
| 63 | (defvar ns-alternate-modifier) | 62 | (defvar ns-alternate-modifier) |
| 64 | 63 | ||
| 65 | ;;;; Command line argument handling. | 64 | ;;;; Command line argument handling. |
| @@ -995,10 +994,6 @@ Lines are highlighted according to `ns-input-line'." | |||
| 995 | (ns-set-resource nil "CommandModifier" (symbol-name ns-command-modifier)) | 994 | (ns-set-resource nil "CommandModifier" (symbol-name ns-command-modifier)) |
| 996 | (ns-set-resource nil "ControlModifier" (symbol-name ns-control-modifier)) | 995 | (ns-set-resource nil "ControlModifier" (symbol-name ns-control-modifier)) |
| 997 | (ns-set-resource nil "FunctionModifier" (symbol-name ns-function-modifier)) | 996 | (ns-set-resource nil "FunctionModifier" (symbol-name ns-function-modifier)) |
| 998 | (ns-set-resource nil "CursorBlinkRate" | ||
| 999 | (if ns-cursor-blink-rate | ||
| 1000 | (number-to-string ns-cursor-blink-rate) | ||
| 1001 | "NO")) | ||
| 1002 | (ns-set-resource nil "ExpandSpace" | 997 | (ns-set-resource nil "ExpandSpace" |
| 1003 | (if ns-expand-space | 998 | (if ns-expand-space |
| 1004 | (number-to-string ns-expand-space) | 999 | (number-to-string ns-expand-space) |
| @@ -1228,28 +1223,6 @@ unless the current buffer is a scratch buffer.") | |||
| 1228 | 0 1)) )) | 1223 | 0 1)) )) |
| 1229 | (if (not tool-bar-mode) (tool-bar-mode t))) | 1224 | (if (not tool-bar-mode) (tool-bar-mode t))) |
| 1230 | 1225 | ||
| 1231 | (defvar ns-cursor-blink-mode) ; nsterm.m | ||
| 1232 | |||
| 1233 | ;; Redefine from frame.el. | ||
| 1234 | (define-minor-mode blink-cursor-mode | ||
| 1235 | "Toggle blinking cursor mode. | ||
| 1236 | With a numeric argument, turn blinking cursor mode on if ARG is positive, | ||
| 1237 | otherwise turn it off. When blinking cursor mode is enabled, the | ||
| 1238 | cursor of the selected window blinks. | ||
| 1239 | |||
| 1240 | Note that this command is effective only when Emacs | ||
| 1241 | displays through a window system, because then Emacs does its own | ||
| 1242 | cursor display. On a text-only terminal, this is not implemented." | ||
| 1243 | :init-value (not (or noninteractive | ||
| 1244 | no-blinking-cursor | ||
| 1245 | (eq ns-cursor-blink-rate nil))) | ||
| 1246 | :initialize 'custom-initialize-safe-default | ||
| 1247 | :group 'cursor | ||
| 1248 | :global t | ||
| 1249 | (if blink-cursor-mode | ||
| 1250 | (setq ns-cursor-blink-mode t) | ||
| 1251 | (setq ns-cursor-blink-mode nil))) | ||
| 1252 | |||
| 1253 | 1226 | ||
| 1254 | 1227 | ||
| 1255 | ;;;; Dialog-related functions. | 1228 | ;;;; Dialog-related functions. |