X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7a22490f14441898e1c4f6679f5924f097f3bb34..ac4c50ad333ca1ba1478b4766c866efeea59eb30:/lisp/nxml/nxml-util.el diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el index 75479160cb..31ade2da76 100644 --- a/lisp/nxml/nxml-util.el +++ b/lisp/nxml/nxml-util.el @@ -1,6 +1,6 @@ -;;; nxml-util.el --- utility functions for nxml-*.el +;;; nxml-util.el --- utility functions for nxml-*.el -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML @@ -45,7 +45,7 @@ (defmacro nxml-debug-clear-inside (start end) (when nxml-debug - `(loop for overlay in (overlays-in ,start ,end) + `(cl-loop for overlay in (overlays-in ,start ,end) if (overlay-get overlay 'nxml-inside-debug) do (delete-overlay overlay) finally (nxml-debug-change "nxml-clear-inside" ,start ,end)))) @@ -70,6 +70,7 @@ This is the inverse of `nxml-make-namespace'." (nxml-make-namespace "http://www.w3.org/2000/xmlns/")) (defmacro nxml-with-degradation-on-error (context &rest body) + (declare (indent 1) (debug t)) (if (not nxml-debug) (let ((error-symbol (make-symbol "err"))) `(condition-case ,error-symbol @@ -80,12 +81,10 @@ This is the inverse of `nxml-make-namespace'." (defmacro nxml-with-invisible-motion (&rest body) "Evaluate body without calling any point motion hooks." + (declare (indent 0) (debug t)) `(let ((inhibit-point-motion-hooks t)) ,@body)) -(put 'nxml-with-invisible-motion 'lisp-indent-function 0) -(def-edebug-spec nxml-with-invisible-motion t) - (defun nxml-display-file-parse-error (err) (let* ((filename (nth 1 err)) (buffer (find-file-noselect filename))