conflict resolve

7 files changed, 44 insertions, 78 deletions

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 2ee73235dd0..44271a689cf 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -540,7 +540,7 @@ Many aspects this mode can be customized using
       (widen)
       (nxml-clear-dependent-regions (point-min) (point-max))
       (setq nxml-scan-end (copy-marker (point-min) nil))
-      (nxml-with-unmodifying-text-property-changes
+      (with-silent-modifications
         (nxml-clear-inside (point-min) (point-max))
         (nxml-with-invisible-motion
           (nxml-scan-prolog)))))
@@ -601,7 +601,7 @@ Many aspects this mode can be customized using
   (save-excursion
     (save-restriction
       (widen)
-      (nxml-with-unmodifying-text-property-changes
+      (with-silent-modifications
         (nxml-clear-inside (point-min) (point-max))))))
 
 ;;; Change management
@@ -625,7 +625,7 @@ Many aspects this mode can be customized using
             (widen)
             (save-match-data
               (nxml-with-invisible-motion
-                (nxml-with-unmodifying-text-property-changes
+                (with-silent-modifications
                   (nxml-after-change1
                    start end pre-change-length)))))))))
 
@@ -910,7 +910,7 @@ Called with `font-lock-beg' and `font-lock-end' dynamically bound."
                        (widen)
                        (save-match-data
                          (nxml-with-invisible-motion
-                           (nxml-with-unmodifying-text-property-changes
+                           (with-silent-modifications
                              (nxml-extend-after-change-region1
                               start end pre-change-length)))))))))
       (if (consp region) region))))
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index e30aee3de53..dab22f7559f 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -149,7 +149,7 @@ See the variable `nxml-section-element-name-regexp' for more details."
 (defun nxml-show-all ()
   "Show all elements in the buffer normally."
   (interactive)
-  (nxml-with-unmodifying-text-property-changes
+  (with-silent-modifications
     (remove-text-properties (point-min)
                             (point-max)
                             '(nxml-outline-state nil)))
@@ -370,7 +370,7 @@ customize which elements are recognized as sections and headings."
   (get-text-property pos 'nxml-outline-state))
 
 (defun nxml-set-outline-state (pos state)
-  (nxml-with-unmodifying-text-property-changes
+  (with-silent-modifications
     (if state
         (put-text-property pos (1+ pos) 'nxml-outline-state state)
       (remove-text-properties pos (1+ pos) '(nxml-outline-state nil)))))
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index bc87044cde6..5bc4d74456b 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -293,7 +293,7 @@ Sets variables like `nxml-token-after'."
       (cond ((memq xmltok-type '(comment
                                  cdata-section
                                  processing-instruction))
-             (nxml-with-unmodifying-text-property-changes
+             (with-silent-modifications
                (nxml-set-inside (1+ xmltok-start) (point) xmltok-type)))
             (xmltok-dependent-regions
              (nxml-mark-parse-dependent-regions)))
@@ -338,7 +338,7 @@ Leave point unmoved if it is not inside anything special."
                                '(comment
                                  processing-instruction
                                  cdata-section))
-                     (nxml-with-unmodifying-text-property-changes
+                     (with-silent-modifications
                        (nxml-set-inside (1+ xmltok-start)
                                         (point)
                                         xmltok-type)))
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index b2d9cdde183..6ba6d21f7ed 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -78,27 +78,6 @@ This is the inverse of `nxml-make-namespace'."
             (nxml-degrade ,context ,error-symbol))))
     `(progn ,@body)))
 
-(defmacro nxml-with-unmodifying-text-property-changes (&rest body)
-  "Evaluate BODY without any text property changes modifying the buffer.
-Any text properties changes happen as usual but the changes are not treated as
-modifications to the buffer."
-  (let ((modified (make-symbol "modified")))
-    `(let ((,modified (buffer-modified-p))
-           (inhibit-read-only t)
-           (inhibit-modification-hooks t)
-           (buffer-undo-list t)
-           (deactivate-mark nil)
-           ;; Apparently these avoid file locking problems.
-           (buffer-file-name nil)
-           (buffer-file-truename nil))
-       (unwind-protect
-           (progn ,@body)
-         (unless ,modified
-           (restore-buffer-modified-p nil))))))
-
-(put 'nxml-with-unmodifying-text-property-changes 'lisp-indent-function 0)
-(def-edebug-spec nxml-with-unmodifying-text-property-changes t)
-
 (defmacro nxml-with-invisible-motion (&rest body)
   "Evaluate body without calling any point motion hooks."
   `(let ((inhibit-point-motion-hooks t))
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 74192f213dc..ff73e3718ec 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -259,7 +259,7 @@
 (defun rng-validate-buffer ()
   (save-restriction
     (widen)
-    (nxml-with-unmodifying-text-property-changes
+    (with-silent-modifications
       (rng-clear-cached-state (point-min) (point-max)))
     ;; 1+ to clear empty overlays at (point-max)
     (rng-clear-overlays (point-min) (1+ (point-max))))
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index cfb8e33cccb..bc070136adb 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -380,9 +380,7 @@ set `xmltok-dtd'.  Returns the position of the end of the token."
                 (< rng-validate-up-to-date-end pos))
       ;; Display percentage validated.
       (force-mode-line-update)
-      ;; Force redisplay but don't allow idle timers to run.
-      (let ((timer-idle-list nil))
-        (sit-for 0)))
+      (sit-for 0))
     (message "Parsing...done"))
   (save-excursion
     (save-restriction
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index a87ab2532ce..e1140980813 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -244,7 +244,7 @@ to use for finding the schema."
           (> (prefix-numeric-value arg) 0)))
   (save-restriction
     (widen)
-    (nxml-with-unmodifying-text-property-changes
+    (with-silent-modifications
       (rng-clear-cached-state (point-min) (point-max)))
     ;; 1+ to clear empty overlays at (point-max)
     (rng-clear-overlays (point-min) (1+ (point-max)))
@@ -305,7 +305,7 @@ The schema is set like `rng-auto-set-schema'."
 
 (defun rng-after-change-function (start end pre-change-len)
   (setq rng-message-overlay-inhibit-point nil)
-  (nxml-with-unmodifying-text-property-changes
+  (with-silent-modifications
     (rng-clear-cached-state start end))
   ;; rng-validate-up-to-date-end holds the position before the change
   ;; Adjust it to reflect the change.
@@ -414,26 +414,17 @@ The schema is set like `rng-auto-set-schema'."
 (defvar rng-validate-display-modified-p nil)
 
 (defun rng-validate-while-idle-continue-p ()
-  ;; input-pending-p and sit-for run timers that are
-  ;; ripe.  Binding timer-idle-list to nil prevents
-  ;; this.  If we don't do this, then any ripe timers
-  ;; will get run, and we won't get any chance to
-  ;; validate until Emacs becomes idle again or until
-  ;; the other lower priority timers finish (which
-  ;; can take a very long time in the case of
-  ;; jit-lock).
-  (let ((timer-idle-list nil))
-    (and (not (input-pending-p))
-         ;; Fake rng-validate-up-to-date-end so that the mode line
-         ;; shows progress.  Also use this to save point.
-         (let ((rng-validate-up-to-date-end (point)))
-           (goto-char rng-validate-display-point)
-           (when (not rng-validate-display-modified-p)
-             (restore-buffer-modified-p nil))
-           (force-mode-line-update)
-           (let ((continue (sit-for 0)))
-             (goto-char rng-validate-up-to-date-end)
-             continue)))))
+  (and (not (input-pending-p))
+       ;; Fake rng-validate-up-to-date-end so that the mode line
+       ;; shows progress.  Also use this to save point.
+       (let ((rng-validate-up-to-date-end (point)))
+         (goto-char rng-validate-display-point)
+         (when (not rng-validate-display-modified-p)
+           (restore-buffer-modified-p nil))
+         (force-mode-line-update)
+         (let ((continue (sit-for 0)))
+           (goto-char rng-validate-up-to-date-end)
+           continue))))
 
 ;; Calling rng-do-some-validation once with a continue-p function, as
 ;; opposed to calling it repeatedly, helps on initial validation of a
@@ -442,24 +433,26 @@ The schema is set like `rng-auto-set-schema'."
 ;; validation process down.
 
 (defun rng-validate-while-idle (buffer)
-  (with-current-buffer buffer
-    (if rng-validate-mode
-        (if (let ((rng-validate-display-point (point))
-                  (rng-validate-display-modified-p (buffer-modified-p)))
-              (rng-do-some-validation 'rng-validate-while-idle-continue-p))
-            (force-mode-line-update)
-          (rng-validate-done))
-      ;; must have done kill-all-local-variables
-      (rng-kill-timers))))
+  (when (buffer-live-p buffer)          ; bug#13999
+    (with-current-buffer buffer
+      (if rng-validate-mode
+          (if (let ((rng-validate-display-point (point))
+                    (rng-validate-display-modified-p (buffer-modified-p)))
+                (rng-do-some-validation 'rng-validate-while-idle-continue-p))
+              (force-mode-line-update)
+            (rng-validate-done))
+        ;; must have done kill-all-local-variables
+        (rng-kill-timers)))))
 
 (defun rng-validate-quick-while-idle (buffer)
-  (with-current-buffer buffer
-    (if rng-validate-mode
-        (if (rng-do-some-validation)
-            (force-mode-line-update)
-          (rng-validate-done))
-      ;; must have done kill-all-local-variables
-      (rng-kill-timers))))
+  (when (buffer-live-p buffer)          ; bug#13999
+    (with-current-buffer buffer
+      (if rng-validate-mode
+          (if (rng-do-some-validation)
+              (force-mode-line-update)
+            (rng-validate-done))
+        ;; must have done kill-all-local-variables
+        (rng-kill-timers)))))
 
 (defun rng-validate-done ()
   (when (or (not (current-message))
@@ -478,7 +471,7 @@ The schema is set like `rng-auto-set-schema'."
         (condition-case-unless-debug err
             (and (rng-validate-prepare)
                  (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context)))
-                   (nxml-with-unmodifying-text-property-changes
+                   (with-silent-modifications
                      (rng-do-some-validation-1 continue-p-function))))
           ;; errors signaled from a function run by an idle timer
           ;; are ignored; if we don't catch them, validation
@@ -880,9 +873,7 @@ means goto the first error."
                             (< rng-validate-up-to-date-end (point-max)))
                    ;; Display percentage validated.
                    (force-mode-line-update)
-                   ;; Force redisplay but don't allow idle timers to run.
-                   (let ((timer-idle-list nil))
-                     (sit-for 0))
+                   (sit-for 0)
                    (setq pos
                          (max pos (1- rng-validate-up-to-date-end)))
                    t)))))
@@ -905,9 +896,7 @@ means goto the first error."
       (while (and (rng-do-some-validation)
                   (< rng-validate-up-to-date-end (min pos (point-max))))
         (force-mode-line-update)
-        ;; Force redisplay but don't allow idle timers to run.
-        (let ((timer-idle-list nil))
-          (sit-for 0)))
+        (sit-for 0))
       (while (and (> arg 0)
                   (setq err (rng-find-previous-error-overlay pos)))
         (setq pos (overlay-start err))