Fix shr.el/image build problem

[gnu-emacs] / lisp / erc / erc-stamp.el

diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index cbcd055c3b0c9fa86ee6202d6d47eb9188e012c2..ee4e1d2fb6dc55650ba7a39410df5945c431a044 100644 (file)
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,6 +1,6 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -347,7 +347,8 @@ changed, it will then print it off to the right."
 Return the empty string if FORMAT is nil."
   (if format
       (let ((ts (format-time-string format time)))
-       (erc-put-text-property 0 (length ts) 'face 'erc-timestamp-face ts)
+       (erc-put-text-property 0 (length ts)
+                              'font-lock-face 'erc-timestamp-face ts)
        (erc-put-text-property 0 (length ts) 'invisible 'timestamp ts)
        (erc-put-text-property 0 (length ts)
                               'isearch-open-invisible 'timestamp ts)
@@ -370,8 +371,8 @@ Return the empty string if FORMAT is nil."
   (and erc-echo-timestamps (not (bound-and-true-p cursor-sensor-mode))
        (cursor-sensor-mode 1))
   (if erc-hide-timestamps
-      (add-to-invisibility-spec 'timespec)
-    (remove-from-invisibility-spec 'timespec)))
+      (add-to-invisibility-spec 'timestamp)
+    (remove-from-invisibility-spec 'timestamp)))
 
 (defun erc-hide-timestamps ()
   "Hide timestamp information from display."