Bump version to 25.0.95

[gnu-emacs] / lisp / calc / calc-embed.el

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 954e5d0b72f86eaab0b5d33ef86eb4b1fa6a1a64..6ba436a7a8239a5e0ed7e0d076a51eeae8548a1c 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1,9 +1,8 @@
 ;;; calc-embed.el --- embed Calc in a buffer
 
-;; Copyright (C) 1990-1993, 2001-2012 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.
 
@@ -30,7 +29,8 @@
 (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)
@@ -329,10 +329,12 @@
       (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.