Browse Source

Make sure the link-storing function returns non-nil.

Carsten Dominik 17 years ago
parent
commit
16bc9499a6
7 changed files with 19 additions and 11 deletions
  1. 2 1
      org-bbdb.el
  2. 4 2
      org-gnus.el
  3. 4 3
      org-info.el
  4. 2 1
      org-mhe.el
  5. 3 2
      org-rmail.el
  6. 2 1
      org-vm.el
  7. 2 1
      org-wl.el

+ 2 - 1
org-bbdb.el

@@ -55,7 +55,8 @@
 	   (company (bbdb-record-getprop (bbdb-current-record) 'company))
 	   (link (org-make-link "bbdb:" name)))
       (org-store-link-props :type "bbdb" :name name :company company
-			    :link link :description name))))
+			    :link link :description name)
+      link)))
 
 (defun org-bbdb-export (path desc format)
   "Create the exprt verison of a bbdb link."

+ 4 - 2
org-gnus.el

@@ -76,7 +76,8 @@ negates this setting for the duration of the command."
 		    "gnus:")
 		  group)
 	    link (org-make-link desc))
-      (org-add-link-props :link link :description desc)))
+      (org-add-link-props :link link :description desc)
+      link))
 
    ((memq major-mode '(gnus-summary-mode gnus-article-mode))
     (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
@@ -99,7 +100,8 @@ negates this setting for the duration of the command."
 			 (org-fixup-message-id-for-http message-id))))
 	(setq link (org-make-link "gnus:" group
 				  "#" (number-to-string article))))
-      (org-add-link-props :link link :description desc)))))
+      (org-add-link-props :link link :description desc)
+      link))))
 
 (defun org-gnus-open (path)
   "Follow an GNUS message or folder link."

+ 4 - 3
org-info.el

@@ -53,9 +53,10 @@
 				":" Info-current-node))
       (setq desc (concat (file-name-nondirectory Info-current-file)
 			 ":" Info-current-node))
-    (org-store-link-props :type "info" :file Info-current-file
-			  :node Info-current-node
-			  :link link :desc desc))))
+      (org-store-link-props :type "info" :file Info-current-file
+			    :node Info-current-node
+			    :link link :desc desc)
+      link)))
 
 (defun org-info-open (path)
   "Follow an INFO message link."

+ 2 - 1
org-mhe.el

@@ -88,7 +88,8 @@ supported by MH-E, but will be slow with pick."
       (setq desc (org-email-link-description))
       (setq link (org-make-link "mhe:" (org-mhe-get-message-real-folder) "#"
 				(org-remove-angle-brackets message-id)))
-      (org-add-link-props :link link :description desc))))
+      (org-add-link-props :link link :description desc)
+      link)))
 
 (defun org-mhe-open (path)
   "Follow an MHE message link."

+ 3 - 2
org-rmail.el

@@ -65,8 +65,9 @@
 	  (setq message-id (org-remove-angle-brackets message-id))
 	  (setq desc (org-email-link-description))
 	  (setq link (org-make-link "rmail:" folder "#" message-id))
-	  (org-add-link-props :link link :description desc))
-	(rmail-show-message rmail-current-message)))))
+	  (org-add-link-props :link link :description desc)
+	  (rmail-show-message rmail-current-message)
+	  link)))))
 
 (defun org-rmail-open (path)
   "Follow an RMAIL message link."

+ 2 - 1
org-vm.el

@@ -76,7 +76,8 @@
 	    (setq folder (replace-match "" t t folder)))
 	(setq desc (org-email-link-description))
 	(setq link (org-make-link "vm:" folder "#" message-id))
-	(org-add-link-props :link link :description desc)))))
+	(org-add-link-props :link link :description desc)
+	link))))
 
 (defun org-vm-open (path)
   "Follow an VM message link."

+ 2 - 1
org-wl.el

@@ -84,7 +84,8 @@
       (setq desc (org-email-link-description))
       (setq link (org-make-link "wl:" wl-summary-buffer-folder-name
 				"#" message-id))
-      (org-add-link-props :link link :description desc))))
+      (org-add-link-props :link link :description desc)
+      link)))
 
 (defun org-wl-open (path)
   "Follow an WL message link."