View | Details | Raw Unified
Collapse All | Expand All

(-) calc-ext.el.~1~ (-1 / +31 lines)
 Lines 1354-1359    Link Here  
  (calc-fancy-prefix 'calc-inverse-flag "Inverse..." n)
  (calc-fancy-prefix 'calc-inverse-flag "Inverse..." n)
)
)

            

              
              
(defconst calc-fancy-prefix-map

            

            

              
              
  (let ((map (make-sparse-keymap)))

            

            

              
              
    (define-key map [t] 'calc-fancy-prefix-other-key)

            

            

              
              
    (define-key map (vector meta-prefix-char t) 'calc-fancy-prefix-other-key)

            

            

              
              
    (define-key map [switch-frame] nil)

            

            

              
              
    (define-key map [?\C-u] 'universal-argument)

            

            

              
              
    (define-key map [?0] 'digit-argument)

            

            

              
              
    (define-key map [?1] 'digit-argument)

            

            

              
              
    (define-key map [?2] 'digit-argument)

            

            

              
              
    (define-key map [?3] 'digit-argument)

            

            

              
              
    (define-key map [?4] 'digit-argument)

            

            

              
              
    (define-key map [?5] 'digit-argument)

            

            

              
              
    (define-key map [?6] 'digit-argument)

            

            

              
              
    (define-key map [?7] 'digit-argument)

            

            

              
              
    (define-key map [?8] 'digit-argument)

            

            

              
              
    (define-key map [?9] 'digit-argument)

            

            

              
              
    map)

            

            

              
              
  "Keymap used while processing calc-fancy-prefix.")

            

            

              
              

            

        
(defun calc-fancy-prefix (flag msg n)
(defun calc-fancy-prefix (flag msg n)

        
  (let (prefix)
  (let (prefix)

        
    (calc-wrapper
    (calc-wrapper

  

    

    

       Lines 1364-1369
       
    
  Link Here 
    

  

        
     (message (if prefix msg "")))
     (message (if prefix msg "")))

        
    (and prefix
    (and prefix

        
	 (not calc-is-keypad-press)
	 (not calc-is-keypad-press)

            

              
              
	 (if (boundp 'overriding-terminal-local-map)

            

            

              
              
	     (setq overriding-terminal-local-map calc-fancy-prefix-map)

            

        
	 (let ((event (calc-read-key t)))
	 (let ((event (calc-read-key t)))

        
	   (if (eq (setq last-command-char (car event)) ?\C-u)
	   (if (eq (setq last-command-char (car event)) ?\C-u)

        
	       (universal-argument)
	       (universal-argument)

  

    

    

       Lines 1376-1384
       
    
  Link Here 
    

  

        
	     (if (or (not (integerp last-command-char))
	     (if (or (not (integerp last-command-char))

        
		     (eq last-command-char ?-))
		     (eq last-command-char ?-))

        
		 (calc-unread-command)
		 (calc-unread-command)

            

              
	       (digit-argument n))))))

              
	       (digit-argument n)))))))

            

        
)
)

        
(setq calc-is-keypad-press nil)
(setq calc-is-keypad-press nil)

            

              
              

            

            

              
              
(defun calc-fancy-prefix-other-key (arg)

            

            

              
              
  (interactive "P")

            

            

              
              
  (if (or (not (integerp last-command-char))

            

            

              
              
	  (and (>= last-command-char 0) (< last-command-char ? )

            

            

              
              
	       (not (eq last-command-char meta-prefix-char))))

            

            

              
              
      (calc-wrapper))  ; clear flags if not a Calc command.

            

            

              
              
  (calc-unread-command)

            

            

              
              
  (setq overriding-terminal-local-map nil))

            

        

        
(defun calc-invert-func ()
(defun calc-invert-func ()

        
  (save-excursion
  (save-excursion



(-) Makefile.~1~
      (-5 / +2 lines)




  

    

    

       Lines 41-47
       
    
  Link Here 
    

  

        

        
# Other macros.
# Other macros.

        
EFLAGS   = -batch
EFLAGS   = -batch

            

              
MAINT	 = -l calc-maint.elc

              
MAINT	 = -l calc-maint.el

            

        

        
# Control whether intermediate files are kept.
# Control whether intermediate files are kept.

        
PURGE	 = -rm -f
PURGE	 = -rm -f

  

    

    

       Lines 154-163
       
    
  Link Here 
    

  

        

        

        
# All this because "-l calc-maint" doesn't work.
# All this because "-l calc-maint" doesn't work.

            

              
maint: calc-maint.elc

              
maint: calc-maint.el

            

            

              
calc-maint.elc: calc-maint.el

              

            

            

              
	cp calc-maint.el calc-maint.elc

              

            

            

              

              

            

        

        
# Create an Emacs TAGS file
# Create an Emacs TAGS file

        
tags: TAGS
tags: TAGS



(-) calc-aent.el.~1~
      (-5 / +5 lines)




  

    

    

       Lines 385-391
       
    
  Link Here 
    

  

        
	  (calc-minibuffer-contains
	  (calc-minibuffer-contains

        
	   "\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))
	   "\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))

        
      (insert "`")
      (insert "`")

            

              
    (setq alg-exp (buffer-string))

              
    (setq alg-exp (field-string))

            

        
    (and (> (length alg-exp) 0) (setq calc-previous-alg-entry alg-exp))
    (and (> (length alg-exp) 0) (setq calc-previous-alg-entry alg-exp))

        
    (exit-minibuffer))
    (exit-minibuffer))

        
)
)

  

    

    

       Lines 393-406
       
    
  Link Here 
    

  

        

        
(defun calcAlg-enter ()
(defun calcAlg-enter ()

        
  (interactive)
  (interactive)

            

              
  (let* ((str (buffer-string))

              
  (let* ((str (field-string))

            

        
	 (exp (and (> (length str) 0)
	 (exp (and (> (length str) 0)

        
		   (save-excursion
		   (save-excursion

        
		     (set-buffer calc-buffer)
		     (set-buffer calc-buffer)

        
		     (math-read-exprs str)))))
		     (math-read-exprs str)))))

        
    (if (eq (car-safe exp) 'error)
    (if (eq (car-safe exp) 'error)

        
	(progn
	(progn

            

              
	  (goto-char (point-min))

              
	  (goto-char (field-beginning))

            

        
	  (forward-char (nth 1 exp))
	  (forward-char (nth 1 exp))

        
	  (beep)
	  (beep)

        
	  (calc-temp-minibuffer-message
	  (calc-temp-minibuffer-message

  

    

    

       Lines 455-468
       
    
  Link Here 
    

  

        
  (interactive)
  (interactive)

        
  (if (calc-minibuffer-contains ".*[@oh] *[^'m ]+[^'m]*\\'")
  (if (calc-minibuffer-contains ".*[@oh] *[^'m ]+[^'m]*\\'")

        
      (calcDigit-key)
      (calcDigit-key)

            

              
    (setq calc-digit-value (buffer-string))

              
    (setq calc-digit-value (field-string))

            

        
    (exit-minibuffer))
    (exit-minibuffer))

        
)
)

        

        
(defun calcDigit-edit ()
(defun calcDigit-edit ()

        
  (interactive)
  (interactive)

        
  (calc-unread-command)
  (calc-unread-command)

            

              
  (setq calc-digit-value (buffer-string))

              
  (setq calc-digit-value (field-string))

            

        
  (exit-minibuffer)
  (exit-minibuffer)

        
)
)