Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270

1 files changed, 2 insertions, 4 deletions

diff --git a/src/print.c b/src/print.c
index edd22abc038..c23e020eb8d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2243,10 +2243,8 @@ print_object (obj, printcharfun, escapeflag)
 
         case Lisp_Misc_Buffer_Local_Value:
           strout ("#<buffer_local_value ", -1, -1, printcharfun, 0);
-          goto do_buffer_local;
-        case Lisp_Misc_Some_Buffer_Local_Value:
-          strout ("#<some_buffer_local_value ", -1, -1, printcharfun, 0);
-        do_buffer_local:
+          if (XBUFFER_LOCAL_VALUE (obj)->local_if_set)
+            strout ("[local-if-set] ", -1, -1, printcharfun, 0);
           strout ("[realvalue] ", -1, -1, printcharfun, 0);
           print_object (XBUFFER_LOCAL_VALUE (obj)->realvalue,
                         printcharfun, escapeflag);