aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Antipov2014-06-22 09:43:58 +0400
committerDmitry Antipov2014-06-22 09:43:58 +0400
commit9c3883b47dabec27d9fde206f3f951387fe946fd (patch)
tree38e3d6c9f9357438f491a11be60cbc84e6d183c1
parentb0358ef86903ac021110b54ee1acce11211c200f (diff)
downloademacs-9c3883b47dabec27d9fde206f3f951387fe946fd.tar.gz
emacs-9c3883b47dabec27d9fde206f3f951387fe946fd.zip
* lisp/electric.el (electric-layout-post-self-insert-function):
* lisp/emacs-lisp/ert.el (ert--insert-infos): * lisp/obsolete/vi.el (vi-set-mark): * lisp/term.el (term-handle-scroll): * lisp/textmodes/bibtex.el (bibtex-fill-field, bibtex-fill-entry): * lisp/gnus/gnus-sum.el (gnus-summary-edit-article-done): * lisp/org/org-mouse.el (org-mouse-do-remotely): * lisp/wid-edit.el (widget-editable-list-value-create): Prefer point-marker to copy-marker of point. * lisp/ob-core.el (org-babel-insert-result): Prefer point-min-marker and point-max-marker.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/electric.el2
-rw-r--r--lisp/emacs-lisp/ert.el2
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/obsolete/vi.el2
-rw-r--r--lisp/org/ChangeLog7
-rw-r--r--lisp/org/ob-core.el4
-rw-r--r--lisp/org/org-mouse.el4
-rw-r--r--lisp/org/org-table.el4
-rw-r--r--lisp/term.el2
-rw-r--r--lisp/textmodes/bibtex.el4
-rw-r--r--lisp/wid-edit.el2
13 files changed, 36 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95c3566dd5b..e494b7e8e7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12013-06-22 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * electric.el (electric-layout-post-self-insert-function):
4 * emacs-lisp/ert.el (ert--insert-infos):
5 * obsolete/vi.el (vi-set-mark):
6 * term.el (term-handle-scroll):
7 * textmodes/bibtex.el (bibtex-fill-field, bibtex-fill-entry):
8 * wid-edit.el (widget-editable-list-value-create): Prefer
9 point-marker to copy-marker of point.
10
12014-06-21 Fabián Ezequiel Gallina <fgallina@gnu.org> 112014-06-21 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 12
3 Fix completion retrieval parsing (bug#17209). 13 Fix completion retrieval parsing (bug#17209).
diff --git a/lisp/electric.el b/lisp/electric.el
index bf73dbb256f..4bf5963e175 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -368,7 +368,7 @@ newline after CHAR but stay in the same place.")
368 (setq pos (electric--after-char-pos)) 368 (setq pos (electric--after-char-pos))
369 ;; Not in a string or comment. 369 ;; Not in a string or comment.
370 (not (nth 8 (save-excursion (syntax-ppss pos))))) 370 (not (nth 8 (save-excursion (syntax-ppss pos)))))
371 (let ((end (copy-marker (point))) 371 (let ((end (point-marker))
372 (sym (if (functionp rule) (funcall rule) rule))) 372 (sym (if (functionp rule) (funcall rule) rule)))
373 (set-marker-insertion-type end (not (eq sym 'after-stay))) 373 (set-marker-insertion-type end (not (eq sym 'after-stay)))
374 (goto-char pos) 374 (goto-char pos)
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 34041aab9a8..6ecb218091a 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1320,7 +1320,7 @@ RESULT must be an `ert-test-result-with-condition'."
1320 (unwind-protect 1320 (unwind-protect
1321 (progn 1321 (progn
1322 (insert message "\n") 1322 (insert message "\n")
1323 (setq end (copy-marker (point))) 1323 (setq end (point-marker))
1324 (goto-char begin) 1324 (goto-char begin)
1325 (insert " " prefix) 1325 (insert " " prefix)
1326 (forward-line 1) 1326 (forward-line 1)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 543a5b1a433..a21e899b6e4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12013-06-22 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * gnus-sum.el (gnus-summary-edit-article-done):
4 Prefer point-marker to copy-marker of point.
5
12014-06-05 Katsumi Yamaoka <yamaoka@jpl.org> 62014-06-05 Katsumi Yamaoka <yamaoka@jpl.org>
2 7
3 * gnus-art.el (gnus-article-edit-part): Don't modifiy markers. 8 * gnus-art.el (gnus-article-edit-part): Don't modifiy markers.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 090cbede76d..c0e099ba3ca 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -10613,7 +10613,7 @@ groups."
10613 (let ((lines (count-lines (point) (point-max))) 10613 (let ((lines (count-lines (point) (point-max)))
10614 (length (- (point-max) (point))) 10614 (length (- (point-max) (point)))
10615 (case-fold-search t) 10615 (case-fold-search t)
10616 (body (copy-marker (point)))) 10616 (body (point-marker)))
10617 (goto-char (point-min)) 10617 (goto-char (point-min))
10618 (when (re-search-forward "^content-length:[ \t]\\([0-9]+\\)" body t) 10618 (when (re-search-forward "^content-length:[ \t]\\([0-9]+\\)" body t)
10619 (delete-region (match-beginning 1) (match-end 1)) 10619 (delete-region (match-beginning 1) (match-end 1))
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index bb57735b0a9..fbdf7a1e920 100644
--- a/lisp/obsolete/vi.el
+++ b/lisp/obsolete/vi.el
@@ -1200,7 +1200,7 @@ SPECIAL FEATURE: char argument can be used to specify shift amount(1-9)."
1200 (let ((aelt (assq char vi-mark-alist))) 1200 (let ((aelt (assq char vi-mark-alist)))
1201 (if aelt 1201 (if aelt
1202 (move-marker (cdr aelt) (point)) ; fixed 6/12/86 1202 (move-marker (cdr aelt) (point)) ; fixed 6/12/86
1203 (setq aelt (cons char (copy-marker (point)))) 1203 (setq aelt (cons char (point-marker)))
1204 (setq vi-mark-alist (cons aelt vi-mark-alist)))))) 1204 (setq vi-mark-alist (cons aelt vi-mark-alist))))))
1205 1205
1206(defun vi-find-matching-paren () 1206(defun vi-find-matching-paren ()
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 669ac2d83d3..569f82dd3d4 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,10 @@
12013-06-22 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * ob-core.el (org-babel-insert-result): Prefer point-min-marker
4 and point-max-marker.
5 * org-mouse.el (org-mouse-do-remotely): Prefer point-marker
6 to copy-marker of point.
7
12014-05-29 Stefan Monnier <monnier@iro.umontreal.ca> 82014-05-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * org-compat.el (org-font-lock-ensure): New function. 10 * org-compat.el (org-font-lock-ensure): New function.
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index e8943c66561..61d9ee3f870 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -2039,8 +2039,8 @@ code ---- the results are extracted in the syntax of the source
2039 t info hash indent))) 2039 t info hash indent)))
2040 (results-switches 2040 (results-switches
2041 (cdr (assoc :results_switches (nth 2 info)))) 2041 (cdr (assoc :results_switches (nth 2 info))))
2042 (visible-beg (copy-marker (point-min))) 2042 (visible-beg (point-min-marker))
2043 (visible-end (copy-marker (point-max))) 2043 (visible-end (point-max-marker))
2044 ;; When results exist outside of the current visible 2044 ;; When results exist outside of the current visible
2045 ;; region of the buffer, be sure to widen buffer to 2045 ;; region of the buffer, be sure to widen buffer to
2046 ;; update them. 2046 ;; update them.
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 27dc0e070fc..9f9538df789 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1005,7 +1005,7 @@ This means, between the beginning of line and the point."
1005 (let ((endmarker (with-current-buffer buffer 1005 (let ((endmarker (with-current-buffer buffer
1006 (outline-end-of-subtree) 1006 (outline-end-of-subtree)
1007 (forward-char 1) 1007 (forward-char 1)
1008 (copy-marker (point))))) 1008 (point-marker))))
1009 (org-with-remote-undo buffer 1009 (org-with-remote-undo buffer
1010 (with-current-buffer buffer 1010 (with-current-buffer buffer
1011 (widen) 1011 (widen)
@@ -1015,7 +1015,7 @@ This means, between the beginning of line and the point."
1015 (and (outline-next-heading) 1015 (and (outline-next-heading)
1016 (org-flag-heading nil))) ; show the next heading 1016 (org-flag-heading nil))) ; show the next heading
1017 (org-back-to-heading) 1017 (org-back-to-heading)
1018 (setq marker (copy-marker (point))) 1018 (setq marker (point-marker))
1019 (goto-char (max (point-at-bol) (- (point-at-eol) anticol))) 1019 (goto-char (max (point-at-bol) (- (point-at-eol) anticol)))
1020 (funcall command) 1020 (funcall command)
1021 (message "_cmd: %S" org-mouse-cmd) 1021 (message "_cmd: %S" org-mouse-cmd)
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index c9522341106..ed926a387b5 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -3182,9 +3182,9 @@ with the prefix ARG."
3182 (save-excursion 3182 (save-excursion
3183 ;; Insert a temporary formula at right after the table 3183 ;; Insert a temporary formula at right after the table
3184 (goto-char (org-table-TBLFM-begin)) 3184 (goto-char (org-table-TBLFM-begin))
3185 (setq s (set-marker (make-marker) (point))) 3185 (setq s (point-marker))
3186 (insert (concat formula "\n")) 3186 (insert (concat formula "\n"))
3187 (setq e (set-marker (make-marker) (point))) 3187 (setq e (point-marker))
3188 ;; Recalculate the table 3188 ;; Recalculate the table
3189 (beginning-of-line 0) ; move to the inserted line 3189 (beginning-of-line 0) ; move to the inserted line
3190 (skip-chars-backward " \r\n\t") 3190 (skip-chars-backward " \r\n\t")
diff --git a/lisp/term.el b/lisp/term.el
index ce6125e2790..95660eae9ad 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3632,7 +3632,7 @@ all pending output has been dealt with."))
3632 (if (< down 0) term-scroll-start term-scroll-end)))) 3632 (if (< down 0) term-scroll-start term-scroll-end))))
3633 (when (or (and (< down 0) (< scroll-needed 0)) 3633 (when (or (and (< down 0) (< scroll-needed 0))
3634 (and (> down 0) (> scroll-needed 0))) 3634 (and (> down 0) (> scroll-needed 0)))
3635 (let ((save-point (copy-marker (point))) (save-top)) 3635 (let ((save-point (point-marker)) (save-top))
3636 (goto-char term-home-marker) 3636 (goto-char term-home-marker)
3637 (cond (term-scroll-with-delete 3637 (cond (term-scroll-with-delete
3638 (if (< down 0) 3638 (if (< down 0)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 8a99ff2926d..3209980c015 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -4840,7 +4840,7 @@ If optional arg MOVE is non-nil move point to end of field."
4840If optional prefix JUSTIFY is non-nil justify as well. 4840If optional prefix JUSTIFY is non-nil justify as well.
4841In BibTeX mode this function is bound to `fill-paragraph-function'." 4841In BibTeX mode this function is bound to `fill-paragraph-function'."
4842 (interactive "*P") 4842 (interactive "*P")
4843 (let ((pnt (copy-marker (point))) 4843 (let ((pnt (point-marker))
4844 (bounds (bibtex-enclosing-field t))) 4844 (bounds (bibtex-enclosing-field t)))
4845 (bibtex-fill-field-bounds bounds justify) 4845 (bibtex-fill-field-bounds bounds justify)
4846 (goto-char pnt))) 4846 (goto-char pnt)))
@@ -4852,7 +4852,7 @@ names appear in column `bibtex-field-indentation', field text starts in
4852column `bibtex-text-indentation' and continuation lines start here, too. 4852column `bibtex-text-indentation' and continuation lines start here, too.
4853If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too." 4853If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too."
4854 (interactive "*") 4854 (interactive "*")
4855 (let ((pnt (copy-marker (point))) 4855 (let ((pnt (point-marker))
4856 (beg (bibtex-beginning-of-entry)) ; move point 4856 (beg (bibtex-beginning-of-entry)) ; move point
4857 bounds) 4857 bounds)
4858 (bibtex-delete-whitespace) 4858 (bibtex-delete-whitespace)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index a857407820c..92e52bff55e 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2626,7 +2626,7 @@ Return an alist of (TYPE MATCH)."
2626 (let* ((value (widget-get widget :value)) 2626 (let* ((value (widget-get widget :value))
2627 (type (nth 0 (widget-get widget :args))) 2627 (type (nth 0 (widget-get widget :args)))
2628 children) 2628 children)
2629 (widget-put widget :value-pos (copy-marker (point))) 2629 (widget-put widget :value-pos (point-marker))
2630 (set-marker-insertion-type (widget-get widget :value-pos) t) 2630 (set-marker-insertion-type (widget-get widget :value-pos) t)
2631 (while value 2631 (while value
2632 (let ((answer (widget-match-inline type value))) 2632 (let ((answer (widget-match-inline type value)))