Bug fixes.

ChangeLog

@@ -1,3 +1,13 @@
+2008-04-25  Carsten Dominik  <dominik@science.uva.nl>
+
+	* Makefile (BATCH): Fix the path to the local lisp files.
+
+	* lisp/org.el (org-emphasis-alist): Use a different face for
+	+word+ under XEmacs - it does not have strike-through.
+
+	* lisp/org-colview.el (org-columns-display-here): Shield more
+	properties of the background face.
+
 2008-04-24  Carsten Dominik  <dominik@science.uva.nl>
 
 	* lisp/org.el (org-indent-item, org-add-planning-info)

Makefile

@@ -31,7 +31,7 @@ infodir = $(prefix)/info
 # BATCH=$(EMACS) -batch -q -eval "(add-to-list (quote load-path) \".\")"
 
 BATCH=$(EMACS) -batch -q -eval                             \
- "(progn (add-to-list (quote load-path) \".\")             \
+ "(progn (add-to-list (quote load-path) \"./lisp\")             \
         (add-to-list (quote load-path) \"$(lispdir)\"))"
 
 # Specify the byte-compiler for compiling org-mode files

lisp/org-colview.el

@@ -135,13 +135,15 @@ This is the compiled version of the format.")
 		       (beginning-of-line 1)
 		       (and (looking-at "\\(\\**\\)\\(\\* \\)")
 			    (org-get-level-face 2))))
+	 (ref-face (or level-face
+		       (and (eq major-mode 'org-agenda-mode)
+			    (get-text-property (point-at-bol) 'face))
+		       'default))
 	 (color (list :foreground
-		      (face-attribute
-		       (or level-face
-			   (and (eq major-mode 'org-agenda-mode)
-				(get-text-property (point-at-bol) 'face))
-			   'default) :foreground)))
-	 (face (list color 'org-column))
+		      (face-attribute ref-face :foreground)
+		      :weight 'normal :strike-through nil
+		      :underline nil))
+	 (face (list color 'org-column level-face))
 	 pom property ass width f string ov column val modval)
     ;; Check if the entry is in another buffer.
     (unless props

lisp/org.el

@@ -2124,12 +2124,13 @@ Use customize to modify this, or restart Emacs after changing it."
 	  (option (boolean :tag "Stacking (DISABLED)       "))))
 
 (defcustom org-emphasis-alist
-  '(("*" bold "<b>" "</b>")
+  `(("*" bold "<b>" "</b>")
     ("/" italic "<i>" "</i>")
     ("_" underline "<u>" "</u>")
     ("=" org-code "<code>" "</code>" verbatim)
     ("~" org-verbatim "" "" verbatim)
-    ("+" (:strike-through t) "<del>" "</del>")
+    ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t))
+     "<del>" "</del>")
     )
   "Special syntax for emphasized text.
 Text starting and ending with a special character will be emphasized, for
@@ -8234,8 +8235,9 @@ be removed."
 	    (end-of-line 1))
 	  (goto-char (point-min))
 	  (widen)
-	  (if (looking-at "[ \t]+\r?\n")
-	      (replace-match ""))
+	  (if (and (looking-at "[ \t]+\n")
+		   (equal (char-before) ?\n))
+	      (backward-delete-char 1))
 	  ts)))))
 
 (defvar org-log-note-marker (make-marker))