Mercurial > emacs
comparison lisp/play/dunnet.el @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Jul 2006 08:59:39 +0000 |
parents | c5406394f567 263c82655d46 |
children | 02cf29720f31 |
comparison
equal
deleted
inserted
replaced
90518:64c755511769 | 90519:138ce2701550 |
---|---|
1302 (error (setq result nil))) | 1302 (error (setq result nil))) |
1303 (unless (not result) | 1303 (unless (not result) |
1304 (condition-case nil | 1304 (condition-case nil |
1305 (dun-rot13) | 1305 (dun-rot13) |
1306 (error (yank))) | 1306 (error (yank))) |
1307 (eval-current-buffer) | 1307 (eval-buffer) |
1308 (kill-buffer (current-buffer))) | 1308 (kill-buffer (current-buffer))) |
1309 (switch-to-buffer old-buffer) | 1309 (switch-to-buffer old-buffer) |
1310 result)) | 1310 result)) |
1311 | 1311 |
1312 ;;; Functions to remove an object either from a room, or from inventory. | 1312 ;;; Functions to remove an object either from a room, or from inventory. |
2574 (insert " ") | 2574 (insert " ") |
2575 (insert value) | 2575 (insert value) |
2576 (insert ")") | 2576 (insert ")") |
2577 (setq eval-error nil) | 2577 (setq eval-error nil) |
2578 (condition-case nil | 2578 (condition-case nil |
2579 (eval-current-buffer) | 2579 (eval-buffer) |
2580 (error (setq eval-error t))) | 2580 (error (setq eval-error t))) |
2581 (kill-buffer (current-buffer)) | 2581 (kill-buffer (current-buffer)) |
2582 (switch-to-buffer "*dungeon*") | 2582 (switch-to-buffer "*dungeon*") |
2583 (if eval-error | 2583 (if eval-error |
2584 (dun-mprincl "Invalid syntax.")))) | 2584 (dun-mprincl "Invalid syntax.")))) |