From 62222158fe3f19462b1963bf9d7847056aeba495 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 11 Jan 2007 16:22:32 +0000 Subject: (hexlify-buffer, dehexlify-buffer): Don't complain and don't activate undo when undo is not active. Reported by Chris . --- lisp/hexl.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lisp/hexl.el') diff --git a/lisp/hexl.el b/lisp/hexl.el index 39c313cb3da..cf678600680 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -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 ;; Maintainer: FSF @@ -706,10 +706,10 @@ You may also type octal digits, to insert a character with that code." "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 @@ This discards the buffer's undo information." "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)) -- cgit v1.2.1