Bug 1265246 - Move Thunderbird-specific change of editor.CR_creates_new_p default from composer.js to all-thunderbird.js override. r=jorgk a=jorgk
authorrsx11m <rsx11m.pub@gmail.com>
Sun, 17 Apr 2016 10:20:44 -0500
changeset 26996 1549ca7806d2dd9e3ea78a0932fb43e9fc614681
parent 26995 f2494750025ac9e4654dab05b174a27b973a4a8f
child 26997 0d5dcdccea0b30d70c39c02a22e7bc7256883619
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, jorgk
bugs1265246
Bug 1265246 - Move Thunderbird-specific change of editor.CR_creates_new_p default from composer.js to all-thunderbird.js override. r=jorgk a=jorgk
editor/ui/composer.js
mail/app/profile/all-thunderbird.js
--- a/editor/ui/composer.js
+++ b/editor/ui/composer.js
@@ -90,13 +90,13 @@ pref("editor.always_show_publish_dialog"
 
 #ifndef XP_MACOSX
 #ifdef XP_UNIX
 pref("editor.disable_spell_checker", false);
 pref("editor.dont_lock_spell_files", true);
 #endif
 #endif
 
-pref("editor.CR_creates_new_p", true);
+pref("editor.CR_creates_new_p", false);
 
 // Pasting images from the clipboard, order of encoding preference: 
 // JPEG-PNG-GIF=0, PNG-JPEG-GIF=1, GIF-JPEG-PNG=2
 pref("clipboard.paste_image_type", 1);
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -283,26 +283,27 @@ pref("mail.close_message_window.on_delet
 pref("mailnews.headers.show_n_lines_before_more", 1);
 
 // We want to keep track of what items are appropriate in
 // XULStore.json. We use versioning to scrub out the things
 // that have become obsolete.
 pref("mail.ui-rdf.version", 0);
 
 /////////////////////////////////////////////////////////////////
-// Overrides of the core mailnews.js prefs
+// Overrides of the core mailnews.js and composer.js prefs
 /////////////////////////////////////////////////////////////////
 pref("mail.showCondensedAddresses", true); // show the friendly display name for people I know
 
 pref("mailnews.attachments.display.start_expanded", false);
 // hidden pref for changing how we present attachments in the message pane
 pref("mailnews.attachments.display.view", 0);
 pref("mail.pane_config.dynamic",            0);
 pref("mailnews.reuse_thread_window2",     true);
 pref("editor.singleLine.pasteNewlines", 4);  // substitute commas for new lines in single line text boxes
+pref("editor.CR_creates_new_p", true);
 
 // hidden pref to ensure a certain number of headers in the message pane
 // to avoid the height of the header area from changing when headers are present / not present
 pref("mailnews.headers.minNumHeaders", 0); // 0 means we ignore this pref
 
 // 0=no header, 1="<author> wrote:", 2="On <date> <author> wrote:"
 // 3="<author> wrote On <date>:", 4=user specified
 pref("mailnews.reply_header_type", 2);