diff --git a/ChangeLog b/ChangeLog
index 265a2fc..35ddb4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2011-12-27  Sam Steingold  <s...@gnu.org>
+       * lisp/bbdb-mua.el (bbdb-annotate-message): Do not offer to
+       replace the name if it is already an AKA.
+
+2011-12-27  Sam Steingold  <s...@gnu.org>
        * lisp/bbdb.el (bbdb-auto-notes-rules): Use :set keyword to reset
        `bbdb-auto-notes-rules-expanded' when `bbdb-auto-notes-rules' is set.
 
diff --git a/lisp/bbdb-mua.el b/lisp/bbdb-mua.el
index c07d4e9..1a34282 100644
--- a/lisp/bbdb-mua.el
+++ b/lisp/bbdb-mua.el
@@ -458,7 +458,8 @@ Return the record matching ADDRESS or nil."
                    (setq fname (car fullname)
                          lname (cdr fullname))
                    (not (and (bbdb-string= fname (bbdb-record-firstname 
record))
-                             (bbdb-string= lname (bbdb-record-lastname 
record))))))
+                             (bbdb-string= lname (bbdb-record-lastname 
record)))))
+                 (not (member name (bbdb-record-aka record))))
 
             ;; name differs from the old name.
             (cond (bbdb-read-only nil);; skip if readonly

-- 
Sam Steingold (http://sds.podval.org/) on Ubuntu 11.10 (oneiric) X 11.0.11004000
http://palestinefacts.org http://thereligionofpeace.com http://iris.org.il
http://ffii.org http://jihadwatch.org http://camera.org
A year spent in artificial intelligence is enough to make one believe in God.


------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
bbdb-info@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bbdb-info
BBDB Home Page: http://bbdb.sourceforge.net/

Reply via email to