aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2006-05-19 09:09:37 +0000
committerYAMAMOTO Mitsuharu2006-05-19 09:09:37 +0000
commit7b39356d19367ebfa56b5de3f466542c72124890 (patch)
tree2dc6a94986793d2290cc676b5d04710c719d416c
parent45380d4259f266d79674c1586e7ff09a167c0b02 (diff)
downloademacs-7b39356d19367ebfa56b5de3f466542c72124890.tar.gz
emacs-7b39356d19367ebfa56b5de3f466542c72124890.zip
(mac-bytes-to-digits): Remove function.
(mac-handle-toolbar-switch-mode): Use coercion instead of it.
-rw-r--r--lisp/term/mac-win.el14
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 6adbdd11274..77a1533ef9a 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1585,17 +1585,6 @@ in `selection-converter-alist', which see."
1585 (ash (lsh result extended-sign-len) (- extended-sign-len)) 1585 (ash (lsh result extended-sign-len) (- extended-sign-len))
1586 result))) 1586 result)))
1587 1587
1588(defun mac-bytes-to-digits (bytes &optional from to)
1589 (or from (setq from 0))
1590 (or to (setq to (length bytes)))
1591 (let ((len (- to from))
1592 (val 0.0))
1593 (dotimes (i len)
1594 (setq val (+ (* val 256.0)
1595 (aref bytes (+ from (if (eq (byteorder) ?B) i
1596 (- len i 1)))))))
1597 (format "%.0f" val)))
1598
1599(defun mac-ae-selection-range (ae) 1588(defun mac-ae-selection-range (ae)
1600;; #pragma options align=mac68k 1589;; #pragma options align=mac68k
1601;; typedef struct SelectionRange { 1590;; typedef struct SelectionRange {
@@ -1693,7 +1682,8 @@ modifiers, it changes global tool-bar visibility setting."
1693 (if (and modifiers (not (string= modifiers "\000\000\000\000"))) 1682 (if (and modifiers (not (string= modifiers "\000\000\000\000")))
1694 ;; Globally toggle tool-bar-mode if some modifier key is pressed. 1683 ;; Globally toggle tool-bar-mode if some modifier key is pressed.
1695 (tool-bar-mode) 1684 (tool-bar-mode)
1696 (let ((window-id (mac-bytes-to-digits (cdr (mac-ae-parameter ae)))) 1685 (let ((window-id
1686 (mac-coerce-ae-data "long" (cdr (mac-ae-parameter ae)) "TEXT"))
1697 (rest (frame-list)) 1687 (rest (frame-list))
1698 frame) 1688 frame)
1699 (while (and (null frame) rest) 1689 (while (and (null frame) rest)