From: Juri Linkov <juri@jurta.org>
Date: Tue, 14 May 2013 23:38:14 +0000 (+0300)
Subject: * lisp/subr.el (find-tag-default-as-regexp): Return nil if `tag' is nil.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=180ed218429ec9c0ce8e3ee186a47c9565459eff;p=emacs.git

* lisp/subr.el (find-tag-default-as-regexp): Return nil if `tag' is nil.

Fixes: debbugs:14390
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d39c434cb6f..5b2c28d97a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-14  Juri Linkov  <juri@jurta.org>
+
+	* subr.el (find-tag-default-as-regexp): Return nil if `tag' is nil.
+	(Bug#14390)
+
 2013-05-14  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/f90.el (f90-imenu-generic-expression):
diff --git a/lisp/subr.el b/lisp/subr.el
index 4871f3733f9..177e9a84a58 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2738,7 +2738,7 @@ symbol at point exactly."
 		   (get major-mode 'find-tag-default-function)
 		   'find-tag-default))
 	 (tag (funcall tagf)))
-    (cond ((not tag))
+    (cond ((null tag) nil)
 	  ((eq tagf 'find-tag-default)
 	   (format "\\_<%s\\_>" (regexp-quote tag)))
 	  (t (regexp-quote tag)))))