Changeset 4161 for trunk/lisp/frame.el

Timestamp:

09/09/06 16:30:10 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/frame.el (modified) (3 diffs)

trunk/lisp/frame.el

@@ -1084 +1084 @@
-      (frame-width (if (framep display) display (selected-frame)))))))
-
+(defcustom display-mm-dimensions-alist nil
+  "Alist for specifying screen dimensions in millimeters.
+The dimensions will be used for `display-mm-height' and
+`display-mm-width' if defined for the respective display.
+
+Each element of the alist has the form (display . (width . height)),
+e.g. (\":0.0\" . (287 . 215)).
+
+If `display' equals t, it specifies dimensions for all graphical
+displays not explicitely specified."
+  :version "22.1"
+  :type '(alist :key-type (choice (string :tag "Display name")
+                                  (const :tag "Default" t))
+                :value-type (cons :tag "Dimensions"
+                                  (integer :tag "Width")
+                                  (integer :tag "Height")))
+  :group 'frames)
+
-(defun display-mm-height (&optional display)
-  "Return the height of DISPLAY's screen in millimeters.
+System values can be overriden by `display-mm-dimensions-alist'.
-If the information is unavailable, value is nil."
-  (and (memq (framep-on-display display) '(x w32 mac))
-
+
+
+
+
-
-(defun display-mm-width (&optional display)
-  "Return the width of DISPLAY's screen in millimeters.
+System values can be overriden by `display-mm-dimensions-alist'.
-If the information is unavailable, value is nil."
-  (and (memq (framep-on-display display) '(x w32 mac))
-
+
+
+
+
-
-(defun display-backing-store (&optional display)
@@ -1254 +1280 @@
-`blink-cursor-interval' seconds.")
-
+(defun blink-cursor-start ()
+  "Timer function called from the timer `blink-cursor-idle-timer'.
+This starts the timer `blink-cursor-timer', which makes the cursor blink
+if appropriate.  It also arranges to cancel that timer when the next
+command starts, by installing a pre-command hook."
+  (when (null blink-cursor-timer)
+    ;; Set up the timer first, so that if this signals an error,
+    ;; blink-cursor-end is not added to pre-command-hook.
+    (setq blink-cursor-timer
+          (run-with-timer blink-cursor-interval blink-cursor-interval
+                          'blink-cursor-timer-function))
+    (add-hook 'pre-command-hook 'blink-cursor-end)
+    (internal-show-cursor nil nil)))
+
+(defun blink-cursor-timer-function ()
+  "Timer function of timer `blink-cursor-timer'."
+  (internal-show-cursor nil (not (internal-show-cursor-p))))
+
+(defun blink-cursor-end ()
+  "Stop cursor blinking.
+This is installed as a pre-command hook by `blink-cursor-start'.
+When run, it cancels the timer `blink-cursor-timer' and removes
+itself as a pre-command hook."
+  (remove-hook 'pre-command-hook 'blink-cursor-end)
+  (internal-show-cursor nil t)
+  (when blink-cursor-timer
+    (cancel-timer blink-cursor-timer)
+    (setq blink-cursor-timer nil)))
+
-(define-minor-mode blink-cursor-mode
-  "Toggle blinking cursor mode.
@@ -1271 +1326 @@
-  :global t
-  (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1")
-
-(defun blink-cursor-start ()
-  "Timer function called from the timer `blink-cursor-idle-timer'.
-This starts the timer `blink-cursor-timer', which makes the cursor blink
-if appropriate.  It also arranges to cancel that timer when the next
-command starts, by installing a pre-command hook."
-  (when (null blink-cursor-timer)
-    (add-hook 'pre-command-hook 'blink-cursor-end)
-    (internal-show-cursor nil nil)
-    (setq blink-cursor-timer
-          (run-with-timer blink-cursor-interval blink-cursor-interval
-                          'blink-cursor-timer-function))))
-
-(defun blink-cursor-timer-function ()
-  "Timer function of timer `blink-cursor-timer'."
-  (internal-show-cursor nil (not (internal-show-cursor-p))))
-
-(defun blink-cursor-end ()
-  "Stop cursor blinking.
-This is installed as a pre-command hook by `blink-cursor-start'.
-When run, it cancels the timer `blink-cursor-timer' and removes
-itself as a pre-command hook."
-  (remove-hook 'pre-command-hook 'blink-cursor-end)
-  (internal-show-cursor nil t)
-  (cancel-timer blink-cursor-timer)
-  (setq blink-cursor-timer nil))
-
-
-
-;; Hourglass pointer