;;; calc-embed.el --- embed Calc in a buffer
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
;; This file is part of GNU Emacs.
(require 'calc-macs)
;; Declare functions which are defined elsewhere.
-(declare-function thing-at-point-looking-at "thingatpt" (regexp))
+(declare-function thing-at-point-looking-at "thingatpt"
+ (regexp &optional distance))
(defun calc-show-plain (n)
"The mode settings for Calc buffer when put in embedded mode.")
(defun calc-embedded-save-original-modes ()
- "Save the current Calc modes when entereding embedded mode."
+ "Save the current Calc modes when entering embedded mode."
(let ((calcbuf (save-excursion
(calc-create-buffer)
(current-buffer)))
(let ((var (cdr (car v))))
(unless (memq var '(the-language the-display-just))
(setq modes
- (cons (cons var (symbol-value var))
+ (cons (cons var (symbol-value var))
modes))))
(setq v (cdr v))))
(setq calc-embedded-original-modes (cons lang modes)))
(calc-set-mode-line))))
(setq calc-embedded-original-modes nil)))
-;; The variables calc-embed-outer-top, calc-embed-outer-bot,
+;; The variables calc-embed-outer-top, calc-embed-outer-bot,
;; calc-embed-top and calc-embed-bot are
;; local to calc-do-embedded, calc-embedded-mark-formula,
;; calc-embedded-duplicate, calc-embedded-new-formula and
;; The variable calc-embed-arg is local to calc-do-embedded,
;; calc-embedded-update-formula, calc-embedded-edit and
-;; calc-do-embedded-activate, but is used by
+;; calc-do-embedded-activate, but is used by
;; calc-embedded-make-info, which is called by the above
;; functions.
(defvar calc-embed-arg)
;; The following is to take care of any minor modes which override
;; a Calc command.
-(defvar calc-override-minor-modes-map
+(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
+(defvar calc-override-minor-modes
(cons t calc-override-minor-modes-map))
(defun calc-do-embedded (calc-embed-arg end obeg oend)
(calc-embedded-save-original-modes)
(or calc-embedded-globals
(calc-find-globals))
- (setq info
+ (setq info
(calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend))
(if (eq (car-safe (aref info 8)) 'error)
(progn
(if calc-embedded-firsttime-formula
(run-hooks 'calc-embedded-new-formula-hook))
(or (eq calc-embedded-quiet t)
- (message "Embedded Calc mode enabled; %s to return to normal"
- (if calc-embedded-quiet
- "Type `C-x * x'"
- "Give this command again")))))
+ (message (concat
+ "Embedded Calc mode enabled; "
+ (if calc-embedded-quiet
+ "Type `C-x * x'"
+ "Give this command again")
+ " to return to normal")))))
(scroll-down 0)) ; fix a bug which occurs when truncate-lines is changed.
(goto-char calc-embed-outer-bot)
(insert "\n")
(setq new-top (point))
- (insert-buffer-substring (current-buffer)
+ (insert-buffer-substring (current-buffer)
calc-embed-outer-top calc-embed-outer-bot)
(goto-char (+ new-top (- calc-embed-top calc-embed-outer-top)))
(let ((calc-embedded-quiet (if already t 'x)))
(equal (symbol-value (car (car v))) value))
(progn
(setq changed t)
- (if temp (setq calc-embed-prev-modes
+ (if temp (setq calc-embed-prev-modes
(cons (cons (car (car v))
(symbol-value (car (car v))))
calc-embed-prev-modes)))
(list modes emodes pmodes)))
;; The variable calc-embed-vars-used is local to calc-embedded-make-info,
-;; calc-embedded-evaluate-expr and calc-embedded-update, but is
+;; calc-embedded-evaluate-expr and calc-embedded-update, but is
;; used by calc-embedded-find-vars, which is called by the above functions.
(defvar calc-embed-vars-used)
(defun calc-embedded-make-info (point cbuf fresh &optional
- calc-embed-top calc-embed-bot
+ calc-embed-top calc-embed-bot
calc-embed-outer-top calc-embed-outer-bot)
(let* ((bufentry (assq (current-buffer) calc-embedded-active))
(found bufentry)
(newform (assoc major-mode calc-embedded-open-close-formula-alist))
(newword (assoc major-mode calc-embedded-word-regexp-alist))
(newplain (assoc major-mode calc-embedded-open-close-plain-alist))
- (newnewform
+ (newnewform
(assoc major-mode calc-embedded-open-close-new-formula-alist))
(newmode (assoc major-mode calc-embedded-open-close-mode-alist)))
(when newann
(aset info 1 (or cbuf (save-excursion
(calc-create-buffer)
(current-buffer)))))
- (if (and
+ (if (and
(or (integerp calc-embed-top) (equal calc-embed-top '(4)))
- (not calc-embed-bot))
+ (not calc-embed-bot))
; started with a user-supplied argument
(progn
(if (equal calc-embed-top '(4))
(if need-display
(calc-embedded-set-justify (cdr (car calc-embed-prev-modes)))))
(t
- (set (car (car calc-embed-prev-modes))
+ (set (car (car calc-embed-prev-modes))
(cdr (car calc-embed-prev-modes)))))
(setq calc-embed-prev-modes (cdr calc-embed-prev-modes))))))