Mercurial > emacs
changeset 75190:f109c3c00000
(hexlify-buffer, dehexlify-buffer): Don't complain and don't
activate undo when undo is not active.
Reported by Chris <christopher.ian.moore@gmail.com>.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 11 Jan 2007 16:22:32 +0000 |
| parents | c456d15d23fd |
| children | 98ad9ce30ba1 |
| files | lisp/ChangeLog lisp/hexl.el |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jan 10 23:48:04 2007 +0000 +++ b/lisp/ChangeLog Thu Jan 11 16:22:32 2007 +0000 @@ -1,3 +1,9 @@ +2007-01-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * hexl.el (hexlify-buffer, dehexlify-buffer): Don't complain and don't + activate undo when undo is not active. + Reported by Chris <christopher.ian.moore@gmail.com>. + 2007-01-10 Stefan Monnier <monnier@iro.umontreal.ca> * ffap.el (ffap-next-regexp, ffap-machine-p, ffap-newsgroup-regexp)
--- a/lisp/hexl.el Wed Jan 10 23:48:04 2007 +0000 +++ b/lisp/hexl.el Thu Jan 11 16:22:32 2007 +0000 @@ -1,7 +1,7 @@ ;;; hexl.el --- edit a file in a hex dump format using the hexl filter ;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu> ;; Maintainer: FSF @@ -706,10 +706,10 @@ "Convert a binary buffer to hexl format. This discards the buffer's undo information." (interactive) - (and buffer-undo-list + (and (consp buffer-undo-list) (or (y-or-n-p "Converting to hexl format discards undo info; ok? ") - (error "Aborted"))) - (setq buffer-undo-list nil) + (error "Aborted")) + (setq buffer-undo-list nil)) ;; Don't decode text in the ASCII part of `hexl' program output. (let ((coding-system-for-read 'raw-text) (coding-system-for-write buffer-file-coding-system) @@ -731,10 +731,10 @@ "Convert a hexl format buffer to binary. This discards the buffer's undo information." (interactive) - (and buffer-undo-list + (and (consp buffer-undo-list) (or (y-or-n-p "Converting from hexl format discards undo info; ok? ") - (error "Aborted"))) - (setq buffer-undo-list nil) + (error "Aborted")) + (setq buffer-undo-list nil)) (let ((coding-system-for-write 'raw-text) (coding-system-for-read buffer-file-coding-system) (buffer-undo-list t))