; Merge from origin/emacs-24

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

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 0da9be0d499617f51f5f06b911f0313e5944d126..fcb4b032096b027f4eea76813ebbd54129907275 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1,6 +1,6 @@
 ;;; calc-embed.el --- embed Calc in a buffer
 
-;; Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -30,7 +30,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)