Changeset 4073 for trunk/lisp/calc/calc-embed.el

Timestamp:

05/03/06 18:37:43 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk (modified) (1 prop)
• trunk/lisp/calc/calc-embed.el (modified) (4 diffs)

trunk/lisp/calc/calc-embed.el

@@ -207 +207 @@
-(defvar calc-embedded-firsttime-formula)
-
+;; The following is to take care of any minor modes which override
+;; a Calc command.
+(defvar calc-override-minor-modes-map 
+  (make-sparse-keymap)
+  "A list of keybindings that might be overwritten by minor modes.")
+
+;; Add any keys that might be overwritten here.
+(define-key calc-override-minor-modes-map "`" 'calc-edit)
+
+(defvar calc-override-minor-modes 
+  (cons t calc-override-minor-modes-map))
+
-(defun calc-do-embedded (calc-embed-arg end obeg oend)
-  (if calc-embedded-info
@@ -238 +250 @@
-                     buffer-read-only nil)
-               (use-local-map (nth 1 mode))
+               (setq minor-mode-overriding-map-alist
+                     (remq calc-override-minor-modes minor-mode-overriding-map-alist))
-               (set-buffer-modified-p (buffer-modified-p))
-               (calc-embedded-restore-original-modes)
@@ -298 +312 @@
-      (set-buffer-modified-p (buffer-modified-p))
-      (use-local-map calc-mode-map)
+      (setq minor-mode-overriding-map-alist
+            (cons calc-override-minor-modes
+                  minor-mode-overriding-map-alist))
-      (setq calc-no-refresh-evaltos nil)
-      (and chg calc-any-evaltos (calc-wrapper (calc-refresh-evaltos)))
@@ -933 +950 @@
-                (if (string-match "[^ \t\n]" str)
-                    (setq pref-len 0
-
+
+
+
-                  (setq val nil))))
-            (if (eq (car-safe val) 'error)