Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-irc.el

diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index 62f3d9596c56fac1ec98c3f02b18a40d9f8ea7a9..333c4b1a4f837e738edd9cffa965bb97f0b46be3 100644 (file)
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -1,6 +1,6 @@
 ;;; org-irc.el --- Store links to IRC sessions
 ;;
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
@@ -108,7 +108,7 @@ attributes that are found."
 (defun org-irc-ellipsify-description (string &optional after)
   "Remove unnecessary white space from STRING and add ellipses if necessary.
 Strip starting and ending white space from STRING and replace any
-chars that the value AFTER with '...'"
+chars that the value AFTER with `...'"
   (let* ((after (number-to-string (or after 30)))
         (replace-map (list (cons "^[ \t]*" "")
                            (cons "[ \t]*$" "")
@@ -172,7 +172,7 @@ the session itself."
            (org-store-link-props
             :type "irc"
             :link (concat "irc:/" link-text)
-            :description (concat "irc session '" link-text "'")
+            :description (concat "irc session `" link-text "'")
             :server (car (car link))
             :port (or (string-to-number (cadr (pop link))) erc-default-port)
             :nick (pop link))