Update FSF's address in GPL notices.

[elisp/mu-cite.git] / mu-bbdb.el

diff --git a/mu-bbdb.el b/mu-bbdb.el
index 738ae96..258b687 100644 (file)
--- a/mu-bbdb.el
+++ b/mu-bbdb.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -79,11 +79,14 @@ Notice that please use (mu-cite-get-value 'bbdb-prefix-register)
 instead of call the function directly."
   (let ((addr (mu-cite-get-value 'address)))
     (or (mu-bbdb-get-attr addr)
-       (let ((return
-              (read-string "Citation name? "
-                           (or (mu-cite-get-value 'x-attribution)
-                               (mu-cite-get-value 'full-name))
-                           'mu-bbdb-history)))
+       (let* ((minibuffer-allow-text-properties nil)
+              (return
+               (mu-cite-remove-text-properties
+                (read-string "Citation name? "
+                             (or (mu-cite-get-value 'x-attribution)
+                                 (mu-cite-get-value 'x-cite-me)
+                                 (mu-cite-get-value 'full-name))
+                             'mu-bbdb-history))))
          (if (and (not (string-equal return ""))
                   (y-or-n-p (format "Register \"%s\"? " return)))
              (mu-bbdb-set-attr return addr))
@@ -102,11 +105,14 @@ Notice that please use (mu-cite-get-value 'bbdb-prefix-register-verbose)
 instead of call the function directly."
   (let* ((addr (mu-cite-get-value 'address))
         (attr (mu-bbdb-get-attr addr))
-        (return (read-string "Citation name? "
-                             (or attr
-                                 (mu-cite-get-value 'x-attribution)
-                                 (mu-cite-get-value 'full-name))
-                             'mu-bbdb-history)))
+        (minibuffer-allow-text-properties nil)
+        (return (mu-cite-remove-text-properties
+                 (read-string "Citation name? "
+                              (or attr
+                                  (mu-cite-get-value 'x-attribution)
+                                  (mu-cite-get-value 'x-cite-me)
+                                  (mu-cite-get-value 'full-name))
+                              'mu-bbdb-history))))
     (if (and (not (string-equal return ""))
             (not (string-equal return attr))
             (y-or-n-p (format "Register \"%s\"? " return)))