Update of /cvsroot/refdb/elisp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27088
Modified Files:
refdb-mode.el
Log Message:
fixed probs with previous checkin
Index: refdb-mode.el
===================================================================
RCS file: /cvsroot/refdb/elisp/refdb-mode.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -U2 -r1.22 -r1.23
--- refdb-mode.el 19 Dec 2005 09:25:10 -0000 1.22
+++ refdb-mode.el 19 Dec 2005 09:30:12 -0000 1.23
@@ -1,8 +1,4 @@
;;; refdb-mode.el --- Minor mode for RefDB interaction
-<<<<<<< refdb-mode.el
;; $Id$
-=======
-;; $Id$
->>>>>>> 1.21
;; Copyright (C) 2005 Markus Hoenicka
@@ -11,13 +7,7 @@
;; (1.10-current) Markus Hoenicka <ma...@mh...>
;; Created: 2003-11-04
[...3848 lines suppressed...]
- stylename
- )
- "*refdb-output*" "*refdb-messages*")
- (error "No style specified"))
-=======
(defvar refdb-getref-by-id-on-region-menu-item
["ID"
@@ -7802,5 +4183,5 @@
))
)
- )
+ )
(kill-new
(cond ((eq type 'docbook)
@@ -8508,5 +4889,4 @@
"*refdb-output*" "*refdb-messages*")
(error "No style specified"))
->>>>>>> 1.21
(message
|
