Prechádzať zdrojové kódy

Merge branch 'maint'

Bastien 5 rokov pred
rodič
commit
8b6060a9bb
2 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 1 1
      lisp/ob-gnuplot.el
  2. 3 3
      lisp/org-agenda.el

+ 1 - 1
lisp/ob-gnuplot.el

@@ -35,7 +35,7 @@
 
 ;; - gnuplot :: http://www.gnuplot.info/
 ;;
-;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
+;; - gnuplot-mode :: you can search the web for the latest active one.
 
 ;;; Code:
 (require 'ob)

+ 3 - 3
lisp/org-agenda.el

@@ -10152,13 +10152,13 @@ When ARG is greater than one mark ARG lines."
       (goto-char (point-min))
       (goto-char (next-single-property-change (point) 'org-hd-marker))
       (while (and (re-search-forward regexp nil t)
-		  (setq txt-at-point (get-text-property (point) 'txt)))
+		  (setq txt-at-point
+			(get-text-property (match-beginning 0) 'txt)))
 	(if (get-char-property (point) 'invisible)
 	    (beginning-of-line 2)
-	  (when (string-match regexp txt-at-point)
+	  (when (string-match-p regexp txt-at-point)
 	    (setq entries-marked (1+ entries-marked))
 	    (call-interactively 'org-agenda-bulk-mark)))))
-
     (unless entries-marked
       (message "No entry matching this regexp."))))